From 742b452dc1e1e66566f912fee4855e473c51e189 Mon Sep 17 00:00:00 2001 From: Greg DeKoenigsberg Date: Wed, 28 Oct 2015 14:38:11 -0400 Subject: [PATCH] @lorin stepping down as maintainer --- lib/ansible/modules/cloud/amazon/_ec2_ami_search.py | 1 - lib/ansible/modules/cloud/amazon/ec2_eip.py | 5 +++-- lib/ansible/modules/cloud/openstack/_keystone_user.py | 2 +- lib/ansible/modules/database/postgresql/postgresql_db.py | 2 +- lib/ansible/modules/database/postgresql/postgresql_user.py | 2 +- lib/ansible/modules/web_infrastructure/htpasswd.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py index 8ef0c0046e..5add0260d8 100644 --- a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py +++ b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py @@ -66,7 +66,6 @@ options: default: paravirtual choices: ["paravirtual", "hvm"] -author: Lorin Hochstein ''' EXAMPLES = ''' diff --git a/lib/ansible/modules/cloud/amazon/ec2_eip.py b/lib/ansible/modules/cloud/amazon/ec2_eip.py index 58b5c990e1..f944a364bb 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_eip.py +++ b/lib/ansible/modules/cloud/amazon/ec2_eip.py @@ -65,8 +65,9 @@ options: required: false default: false version_added: "2.0" -extends_documentation_fragment: aws -author: "Lorin Hochstein (@lorin) " +extends_documentation_fragment: + - aws + - ec2 author: "Rick Mendes (@rickmendes) " notes: - This module will return C(public_ip) on success, which will contain the diff --git a/lib/ansible/modules/cloud/openstack/_keystone_user.py b/lib/ansible/modules/cloud/openstack/_keystone_user.py index 48cc87b241..9586b8b70a 100644 --- a/lib/ansible/modules/cloud/openstack/_keystone_user.py +++ b/lib/ansible/modules/cloud/openstack/_keystone_user.py @@ -90,7 +90,7 @@ options: requirements: - "python >= 2.6" - python-keystoneclient -author: "Lorin Hochstein (@lorin)" +author: "Ansible Core Team (deprecated)" ''' EXAMPLES = ''' diff --git a/lib/ansible/modules/database/postgresql/postgresql_db.py b/lib/ansible/modules/database/postgresql/postgresql_db.py index 469d68fa0f..762cb65e92 100644 --- a/lib/ansible/modules/database/postgresql/postgresql_db.py +++ b/lib/ansible/modules/database/postgresql/postgresql_db.py @@ -95,7 +95,7 @@ notes: - This module uses I(psycopg2), a Python PostgreSQL database adapter. You must ensure that psycopg2 is installed on the host before using this module. If the remote host is the PostgreSQL server (which is the default case), then PostgreSQL must also be installed on the remote host. For Ubuntu-based systems, install the C(postgresql), C(libpq-dev), and C(python-psycopg2) packages on the remote host before using this module. requirements: [ psycopg2 ] -author: "Lorin Hochstein (@lorin)" +author: "Ansible Core Team" ''' EXAMPLES = ''' diff --git a/lib/ansible/modules/database/postgresql/postgresql_user.py b/lib/ansible/modules/database/postgresql/postgresql_user.py index 2a9b9a2d9d..1c745266b4 100644 --- a/lib/ansible/modules/database/postgresql/postgresql_user.py +++ b/lib/ansible/modules/database/postgresql/postgresql_user.py @@ -137,7 +137,7 @@ notes: to all users. You may not specify password or role_attr_flags when the PUBLIC user is specified. requirements: [ psycopg2 ] -author: "Lorin Hochstein (@lorin)" +author: "Ansible Core Team" ''' EXAMPLES = ''' diff --git a/lib/ansible/modules/web_infrastructure/htpasswd.py b/lib/ansible/modules/web_infrastructure/htpasswd.py index 361a131ef2..4253f1572a 100644 --- a/lib/ansible/modules/web_infrastructure/htpasswd.py +++ b/lib/ansible/modules/web_infrastructure/htpasswd.py @@ -69,7 +69,7 @@ notes: - "On Debian, Ubuntu, or Fedora: install I(python-passlib)." - "On RHEL or CentOS: Enable EPEL, then install I(python-passlib)." requires: [ passlib>=1.6 ] -author: "Lorin Hochstein (@lorin)" +author: "Ansible Core Team" """ EXAMPLES = """