ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity
27040 commits 10 branches 167 tags 272 MiB
Commit graph

13655 commits

Author SHA1 Message Date
Kevin Hulquest
e47a5674fb Add facts and storage system modules. (#2748) 
* Add facts and storage system modules.

* Update version metadata.

* Add facts and storage system modules.

Update version metadata.

Add init files.

* Fixes for review comments.

* Fixes for review comments.

* Update document fragments for api_* options to indicate they are required.

* Correct bad string concatenation.

* Add option description for validate_certs since basic_auth arg_spec is no longer extended.

* Add default value for validate_certs in docstring.

* Rename directory name so it applies to netapp and not simply eseries platform.

* Rename modules to differentiate other netapp modules.
 2016-12-08 11:34:47 -05:00
Robin Roth
fb49e0401e Ensure the return value for changed is bool (#2830) 
fixes #2827
 2016-12-08 11:34:47 -05:00
Michael Grandjean
70e8bb3092 Fix typo in EXAMPLE section (#2833) 2016-12-08 11:34:47 -05:00
John R Barker
b7afa14f64 Minor tidyup (#2828) 2016-12-08 11:34:47 -05:00
Matt Clay
7e3af74fae Add python3 testing for module PRs. (#2825) 2016-12-08 11:34:47 -05:00
Ryan Brown
2858d24acb New module: execute_lambda (AWS) (#2558) 
First version of execute_lambda module

Supports:
- Synchronous or asynchronous invocation
- Tailing log of execution (sync execution only)
- check mode
 2016-12-08 11:34:47 -05:00
Monty Taylor
510e1140ce Error if shade is too old for domain_id on os_project (#2806) 
* Error if shade is too old for domain_id on os_project

os_project's domain_id parameter requires shade >= 1.8.1 to work. Be
explicit.

Fixes #2805 os_project requires python-shade 1.8.1 or higher

* What I really meant was 1.8.0
 2016-12-08 11:34:47 -05:00
Matt Martz
91abacfca7 Make sure we don't catch rc=0 as a timeout (#2823) 2016-12-08 11:34:47 -05:00
Toshio Kuratomi
3cb7e4bd0e Style cleanups: 
* Don't use iterkeys
* Don't use wildcard imports
 2016-12-08 11:34:47 -05:00
Michael Scherer
b255ac4ea6 Use six for iteration, to make it run on python3 (#2800) 2016-12-08 11:34:47 -05:00
Tim Rupp
acdbe5cb3f Adds allow_service parameter to bigip_selfip (#2808) 
This parameter can be used to open up access to (among other things)
the mgmt address of a BIG-IP. It is necessary for configuring bigips
in an HA configuration.
 2016-12-08 11:34:47 -05:00
Tobias Rueetschi
c0ad8b030e udm_user: change overridePWHistory and overridePWLength to snake_case 2016-12-08 11:34:47 -05:00
Tobias Rueetschi
e4dd122ab7 univention udm_user: override password history. 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
10a2eb9304 udm_user: change code to fit documentation with snake_case instead of camelCase 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
34445d515d udm_user: change camelCase to snake_case in documentation 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
3d563324dd univention udm_user: pep8 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
661cf5d5ea univention udm_share: add aliases as documented 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
3709fb651d univention udm_share: change documentation, use camel_case for parameters, old parameter names as alias 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
de34fdf681 univention udm_share: pep8 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
8eb496989e univention udm_share: add example 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
ea72534151 univention udm_share: change some parameters to type bool 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
1cc3afdbdd univention udm_share: reorder documentation parameters 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
7dd96079f0 univention udm_share: add documenation 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
db4aca4621 univention udm_share: import only AnsibleModule from ansible.module_utils.basic 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
6e4da8987e univention udm_share: add license information 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
b38979321d univention udm_share: add required_if to the API 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
bba8cdf0af univention udm_share: fix shebang 2016-12-08 11:34:46 -05:00
Tobias Rueetschi
afccc72d41 univention udm_share: adapt to library univention_umc 2016-12-08 11:34:46 -05:00
Tobias Rüetschi
a973d8e9c4 UCS udm_share: fix creating of new shares 2016-12-08 11:34:45 -05:00
Tobias Rüetschi
66380d6b7f UCS udm_share: added 2016-12-08 11:34:45 -05:00
Ethan Devenport
dcd7544b26 Added parameter choices for bus. 2016-12-08 11:34:45 -05:00
Ethan Devenport
403c1ddf7b Set variable types, defined choices, and cleaned up whitespace. 2016-12-08 11:34:45 -05:00
Ethan Devenport
f9e0830b44 Reverting recent commits back to initial PR and will move the new profitbricks_firewall_rule module and other recent changes to a new branch. 
Revert "Added support for firewall rules, consolidated resource UUID retrieval methods for server and NIC modules, and set LAN type to int."

This reverts commit 464cbb89f225578386a830624633a55e39054544.
 2016-12-08 11:34:45 -05:00
Ethan Devenport
e1960d2488 Added RETURN documentation. 2016-12-08 11:34:45 -05:00
Ethan Devenport
a3200fc98e Some further documentation updates including version. 2016-12-08 11:34:45 -05:00
Ethan Devenport
93a237f604 Minor documentation corrections. 2016-12-08 11:34:45 -05:00
Ethan Devenport
4b7a4e4495 Added support for firewall rules, consolidated resource UUID retrieval methods for server and NIC modules, and set LAN type to int. 2016-12-08 11:34:45 -05:00
Ethan Devenport
e2c8fec8d9 Included version_added for new options. 2016-12-08 11:34:45 -05:00
Ethan Devenport
267052d7a5 Removed us/lasdev datacenter which the cloud provider no longer maintains. 2016-12-08 11:34:45 -05:00
Ethan Devenport
6d8e3eac7b Additional provider features added and fixed some bugs. * Added support for SSH keys, image passwords, SSD disk type, and CPU family. * Adjusted server create so that IP address is returned in response. * Restructured remove server method(s) to handle change status properly, gracefully handle missing servers, and improve overall performance. * Prevent duplicate server names from being provisioned so removals can be handled appropriately. * Fixed a bug in the count increment being a string rather than an integer. * Fixed issue with create_volume returning invalid response. * Fixed type bug in volume instance_ids for volume removal and improved volume management. * Fixed type bug in instance_ids for proper server removal and moved boot volume creation into composite server build request. * General clean up. 2016-12-08 11:34:45 -05:00
Wong Hoi Sing Edison
d9a1b04e40 Fix ansible/ansible-modules-extras#1682: add dispersed volume support for gluster_volume (#2708) 2016-12-08 11:34:45 -05:00
afunix
32574aa358 gluster_volume module parses out additional hostnames provided by "gluster peer status" command [#1405] (#2811) 2016-12-08 11:34:45 -05:00
René Moser
4017be741a ec2_vpc_dhcp_options_facts: fix exception handling, fixes build (#2819) 2016-12-08 11:34:45 -05:00
Fabio Alessandro Locati
4af6033469 Require domain in rocketchat (#2803) 
* Set the domain as required

* Add domain in the examples as well
 2016-12-08 11:34:44 -05:00
Joe Smith
09776a9e52 Set explicit type for timeout (#2809) 
vmware_maintenancemode.py needs explicit type for timeout, otherwise it reads timeout as string and breaks.
 2016-12-08 11:34:44 -05:00
John R Barker
abaf6afc0a ec2_vpc_dhcp_options_facts.py no py3 
Old PR was merged that hadn't been updated since we added the py3 checks
 2016-12-08 11:34:44 -05:00
Tobias Rüetschi
e318c9b008 Feature udm dns zone (#2382) 
* UCS udm_dns_zone: added

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_dns_zone: updated, add supports check mode

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_dns_zone: updated, add support to modify dns zones

* UCS udm_dns_zone: change string formating

* UCS udm_dns_zone: add a function to convert the time to the biggest unit

* UCS udm_dns_zone: add type definitions to the argument specification

* UCS udm_dns_zone: update function convert_time

* UCS udm_dns_zone: only modify object if it has changed

* UCS udm_dns_zone: add documentation

* UCS udm_dns_zone: fix checks

* UCS udm_dns_zone: if dns zone not exists, changed is always true

* UCS udm_dns_zone: documentation, add version_added

* UCS udm_dns_zone: add license and fix travis for python 3

* UCS udm_dns_zone: import common code for univention from ansible.module_utils.univention

* univention udm_dns_zone: adapt to library univention_umc

* univention udm_dns_zone: lint

* univention udm_dns_zone: add requirement python >= 2.6 to documentation

* univention udm_dns_zone: dont import time, its unused
 2016-12-08 11:34:44 -05:00
Adam Števko
d56c34ea9e Add modules to configure Solaris/illumos networking (1st batch) (#2416) 
* Add modules to configure Solaris/illumos networking (1st batch)

* Add choices to temporary flags
 2016-12-08 11:34:44 -05:00
Olivier Boukili
f43eb7c79e new module: apache2_mod_proxy (#2148) 
* module apache2_mod_proxy

* Moved state notes to state description.
 2016-12-08 11:34:44 -05:00
TimothyVandenbrande
0b135aa6da This is an ansible module to control/create/adapt/remove VMs on a RHEV/oVirt environment. (#2202) 2016-12-08 11:34:44 -05:00
René Moser
d7b68e0e80 new modules for managing exoscale DNS (#2788) 2016-12-08 11:34:44 -05:00
Tobias Rüetschi
16464d5021 Feature udm group (#2396) 
* UCS udm_group: added

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_group: updated

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_group: add key description

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* python styling

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_group: updated, add supports check mode

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_group: updated, add support to modify groups

* UCS udm_group: change string formating

* UCS udm_group: add type definitions to the argument specification

* UCS udm_group: import common code for univention from ansible.module_utils.univention

* univention udm_group: add documentation

* UCS udm_group: add requirement python >= 2.6

* univention udm_group: add more examples
 2016-12-08 11:34:44 -05:00
Tobias Rüetschi
7506ea3a37 Feature udm dns record (#2394) 
* UCS udm_dns: added

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_dns_record: fix multiple entries in different zones

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_dns -> udm_dns_record: renamed

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_dns_record: updated, add supports check mode

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_dns_record: updated, add support to modify dns records

* UCS udm_dns_record: change string formating

* UCS udm_dns_record: add type definitions to the argument specification

* UCS udm_dns_record: import common code for univention from ansible.module_utils.univention_umc

* UCS udm_dns_record: add documentation

* UCS udm_dns_record: update documenation

* univention udm_dns_record: pylint

* univention udm_dns_record: fix reverse zone entries
 2016-12-08 11:34:44 -05:00
naslanidis
cbd2025223 new AWS module for ec2 dhcp option facts (#2001) 
new ec2 dhcp option facts module
 2016-12-08 11:34:44 -05:00
James Higgins
f7ac1f7f90 Just use netloc to identify bucket name for s3 locations (#2713) 2016-12-08 11:34:44 -05:00
René Moser
43ea275856 vmware_local_user_manager: fix global name 'module' is not defined (#2818) 2016-12-08 11:34:44 -05:00
alxsey
0bfaf34286 Implement template storage selection (#2755) 2016-12-08 11:34:44 -05:00
Mike Liu
73cf1f2755 Iptables enhancements (#2789) 
* Add the flush parameter.

When specified the flush parameter indicates that this module should remove all
rules from the specified table. If no table parameter is specified then the
default filter table is flushed.

* Add support for setting chain policies.

The module supports setting the policy of a given chain and table to the
following target values, ACCEPT, DROP, QUEUE, and RETURN. This parameter ignores
all other unrelated parameters.

* Fix pep8 issues.

* Fix missing quotation.

* Make 'flush' and 'policy' parameters mutually exclusive.

This combination is not supported by the wrapped iptables command. 'flush' and
'policy' however, can both take the 'chain' argument.
 2016-12-08 11:34:44 -05:00
bbooysen
41713d0819 typo fix (#2816) 
Changed 'memroy' to 'memory'.
 2016-12-08 11:34:43 -05:00
Tim Rupp
e4ddd4358c Fixes documentation bugs in bigip_irule (#2797) 
The return docs were incorrect for this module. This patch fixes them
and adds some additional return values
 2016-12-08 11:34:43 -05:00
Toshio Kuratomi
53e7fee617 We've decided that python-3.5 is our minimum pyhton3 version (#2798) 2016-12-08 11:34:43 -05:00
Tobias Rüetschi
3d1474bbd1 Feature udm user (#2406) 
* Creating directory univention

* UCS udm_user: added

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_user: updating, added support to modify user groups

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_user: add key homedrive

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_user: add key userexpiry

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* python styling

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_user: updated, add supports check mode

Signed-off-by: Tobias Rüetschi <tobias.ruetschi@adfinis-sygroup.ch>

* UCS udm_user: updated, add support to modify users

* UCS udm_user: change string formating

* UCS udm_user: add type definitions to the argument specification

* UCS udm_user: only modify object if it has changed

* UCS udm_user: if user not exists, changed is always true

* UCS udm_user: import common code for univention from ansible.module_utils.univention_umc

* UCS udm_user: add a lot more attributes

* UCS udm_user: add license information

* UCS udm_user: fix API serviceprovider and unixhome

* UCS udm_user: add documentation

* univention udm_user: import only AnsibleModule from ansible.module_utils.basic

* univention udm_user: reorder documentation options

* univention udm_user: fix documentation

* univention udm_user: dont log password

* univention udm_user: add more examples
 2016-12-08 11:34:43 -05:00
Massimo Gervasini
c934ab7e8b when write_config is no, we should not try to write any configuration changes 2016-12-08 11:34:43 -05:00
Toshio Kuratomi
66af5335c2 Moved the atomic modules to cloud/atomic. (#2784) 
Similar category to docker and lxd
 2016-12-08 11:34:43 -05:00
Tim Rupp
97d41d54ab Adds provision info to bigip facts (#2783) 
This patch adds provision information to the bigip_facts module
through a "provision" include.
 2016-12-08 11:34:43 -05:00
Russell Teague
150a044728 Fix vmware_dvs_portgroup destroy task (#2776) 
Fixes #2761
 2016-12-08 11:34:43 -05:00
Manuel Sousa
73c39c3aaf rabbitmq_queue - Update requirements to show minimum version of requests (#2786) 2016-12-08 11:34:43 -05:00
Manuel Sousa
d4d83fea2c rabbitmq_binding - Update requirements to show minimum version of requests (#2787) 2016-12-08 11:34:43 -05:00
Manuel Sousa
f7c732ad34 rabbitmq_exchange - Update requirements to show minimum version of requests (#2785) 2016-12-08 11:34:43 -05:00
Lingxian Kong
0446db9afd Add openstack os_server_group module (#2702) 2016-12-08 11:34:43 -05:00
Tim Rupp
e5f629500d New module bigip_irule 
This module can be used to maintain the iRules for both LTM and GTM
on a BIG-IP. iRules should be supplied in their string form using
normal strings (unlikely), file lookups (likely), or template
lookups (likely).

Tests for this module can be found here

https://github.com/F5Networks/f5-ansible/blob/master/roles/__bigip_irule/tasks/main.yaml

Platforms this was tested on are

11.6.1
12.0.0
12.1.0
 2016-12-08 11:34:43 -05:00
Tim Rupp
d84e3b6ed7 This module can be used as part of the bootstrapping of a BIG-IP. It allows one to configure the various NTP settings that are part of a BIG-IP. 
Tests for this module can be found here

https://github.com/F5Networks/f5-ansible/blob/master/roles/__bigip_device_ntp/tasks/main.yaml

Platforms this was tested on are

11.6.0
12.0.0
12.1.0
12.1.0 HF1
 2016-12-08 11:34:43 -05:00
Tim Rupp
57c3ae838d Addition of bigip_device_sshd module 
This module can be used as part of the bootstrapping of a BIG-IP. It
allows one to configure the various SSHD settings that are part of
a BIG-IP.

Tests for this module can be found here

https://github.com/F5Networks/f5-ansible/blob/master/roles/__bigip_device_sshd/tasks/main.yaml

Platforms this was tested on are

11.6.0
12.0.0
12.1.0
12.1.0 HF1
 2016-12-08 11:34:43 -05:00
Toshio Kuratomi
7a8b080506 Get hipchat, sns, and typetalk notification modules compiling on py3 (#2782) 2016-12-08 11:34:42 -05:00
Kevin Brebanov
4999bb28cd apk: Fix mutual exclusivity (#2768) 
* apk: Fix mutual exclusivity

Ensure that 'name' and 'upgrade' are mutually exclusive.
Also add a note to the documentation to say so.

Fixes: #2767

* Fix documentation
 2016-12-08 11:34:42 -05:00
Tim Rupp
9ff52723a9 Adds documentation fragment to bigip modules 
This patch removes the common documentation bits and replaces them
with a doc fragment that already exists in core
 2016-12-08 11:34:42 -05:00
Jiri Tyr
3dc7bfa6b8 Adding jenkins_plugin module (#1730) 2016-12-08 11:34:42 -05:00
Richard Metzler
7fddb83f91 letsencrypt: update URL for agreement pdf (#2696) 
The Let's Encrypt Subscriber Agreement changed on Aug 01, 2016
https://letsencrypt.org/repository/
 2016-12-08 11:34:42 -05:00
Matt Clay
2224a7b5a7 Enable CI on Shippable for OS X. (#2779) 2016-12-08 11:34:42 -05:00
Brian Coca
64e11d202c updated blacklist 2016-12-08 11:34:42 -05:00
Adrian Likins
9fb53e12ce Add a 'requirements:' field to cloudflare_dns doc (#2631) 
cloudflare_dns.py makes use of the python
2.6 features (the string .format() method).
 2016-12-08 11:34:42 -05:00
Brian Coca
24b4b1b762 renamed bmc to remote_management to clarify 2016-12-08 11:34:42 -05:00
Kevin Carter
eab15da081 Remove the subsystem lock loop (#2647) 
This change removes the loop watching for "/var/lock/subsys/lxc" from
the lxc-container module. This change simply runs the command within
a container using the lxc CLI tools which should be responcible for
locking and unlocking on their own.

Closes-Issue: https://github.com/ansible/ansible-modules-extras/issues/690
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
 2016-12-08 11:34:42 -05:00
ovcharenko
3e31eaf419 ufw fails asking for a direction for rules without an interface specified [#2758] (#2759) 2016-12-08 11:34:42 -05:00
Angus Williams
692fb45e26 bigip_pool_member: fix idempotency with session_state argument (#2745) 2016-12-08 11:34:42 -05:00
Tim Rupp
68d819e342 Another bootstrapping module, this module allows for one to manage route domains on a BIG-IP. 
Tests for this module can be found here

https://github.com/F5Networks/f5-ansible/blob/master/roles/__bigip_routedomain/tasks/main.yaml

Platforms this was tested on are

11.6.0
12.0.0
12.1.0
12.1.0 HF1
 2016-12-08 11:34:42 -05:00
Tim Rupp
f84b4f1168 Adds the bigip_selfip module 
Another bootstrapping module, this module allows for one to manage
self IP addresses on a BIG-IP.

Tests for this module can be found here

https://github.com/F5Networks/f5-ansible/blob/master/roles/__bigip_selfip/tasks/main.yaml

Platforms this was tested on are

11.5.4 HF1
11.6.0
12.0.0
12.1.0 HF1
 2016-12-08 11:34:42 -05:00
whiter
685803dbcc New module s3_website to manage static sites on Amazon S3 2016-12-08 11:34:42 -05:00
Rob White
f420adfc99 New module - ec2_asg_facts 
Gathers facts about multiple of single AWS autoscaling groups.
 2016-12-08 11:34:41 -05:00
nitzmahone
6db9ed981e clean up win_chocolatey doc bugs, remove redundant 2016-12-08 11:34:41 -05:00
Greyeye
4bae025666 pass flag to choco, allowemptychecksums and ignorechecksums (#2722) 2016-12-08 11:34:41 -05:00
Saravanan K R
75f395dd34 Added modules to manage Atomic Host Platform (host and image) (#1902) 
* Added modules to manage Atomic Host Platform (host and image)

* Fixed review comments

* Fixed requirements and locale setting
 2016-12-08 11:34:41 -05:00
Brian Coca
1cfdfac139 updated version_added to be string 2016-12-08 11:34:41 -05:00
Brian Coca
3787b9baf8 fixed incorrect import deps (#2747) 2016-12-08 11:34:41 -05:00
nitzmahone
2c87fe3b58 make the win_chocolatey force arg actually work 
fixes #1561
 2016-12-08 11:34:41 -05:00
nitzmahone
a2f9e0d2fe isolate chocolatey bootstrapper execution 
fixes #2742
added output capture/return, exit code check to bootstrapper exec
 2016-12-08 11:34:41 -05:00
Robyn Bergeron
fa511fa763 Update GUIDELINES.md 2016-12-08 11:34:41 -05:00
Robyn Bergeron
1f873bac54 creating GUIDELINES.md 
Made a copy from MAINTAINERS.md (and then need to delete maintainers.md).
 2016-12-08 11:34:41 -05:00
Shinichi TAMURA
a3860ecf1e Allow value to be bool where 'yes'/'no' are in choices (#2593) 
* Changed type of 'details' argument to bool on ecs_service_facts module.

* Changed type of 'autostart' argument to bool on virt_* modules.

* Changed types of 'autoconnect' and 'stp' argument to bool on nmcli module.
('create_connection_bridge(self)' and 'modify_connection_bridge(self)' are not implemented yet?)

* Added conversion of 'value' argument when 'vtype' is boolean on debconf module.
 2016-12-08 11:34:41 -05:00
Andrea Scarpino
b54d352a69 win_firewall_rule: fix "property X doesn't exist" 
After commit 9392943 more properties are always sets with their defaults
values (e.g. service to 'any'). This causes no issue when the rule is created,
but causes an error message that says "The property 'X' cannot be found on this
object. Verify that the property exists." because the module checks for
any property value that has changed, but `netsh advfirewall firewall show rule`
does not list any property unless `verbose` is set. This patch solves this.

Fixes #2624
 2016-12-08 11:34:41 -05:00