Commit graph

2739 commits

Author SHA1 Message Date
jctanner
de1e3f0cbc Merge pull request #4054 from mhite/bigip_pool_member
New bigip_pool_member module
2013-10-22 13:55:41 -07:00
Dave Simons
4d4518ed52 fix conversion from file to hardlink when force=yes
Signed-off-by: Dave Simons <dave@inuits.eu>
2013-10-22 10:46:45 +02:00
Maykel Moya
3db7ec8356 Fail if requested variable is not available 2013-10-22 09:30:19 +02:00
bennojoy
0c275424c6 fix to work like copy module 2013-10-22 09:03:52 +05:30
Scott Sturdivant
4d24e2e29f If the output of rcvar isn't a key=value pair, ignore it. 2013-10-21 14:20:54 -06:00
bennojoy
788e783b6d fix for overwrite in put operation 2013-10-21 09:46:21 +05:30
Eugene Archibald
30eb5c7342 Fixed (broken) tab to (correct) spaces for indentation 2013-10-19 17:04:37 -07:00
Michael DeHaan
21d4400c96 Misc pep8 fixes 2013-10-19 13:03:15 -04:00
Michael DeHaan
aa93ce2dc2 Fix deprecation warnings in the Google modules. 2013-10-19 13:03:14 -04:00
Michael DeHaan
75e0a1c6de Merge pull request #4592 from mscherer/fix_4586
setup module, replace ':' by '_' in interface name, fix #4586
2013-10-19 09:07:56 -07:00
Jimmy Tang
0568abeb14 check for ubuntu distribution first 2013-10-19 14:41:00 +01:00
Eugene Archibald
145c0b8be1 Added ['date_time']['tz_offset'] using %z to get the time offset rather than time zone. 2013-10-18 20:32:35 -07:00
Patrick Michaud
c1e241577c Allow generic django_management commands
This commit removes the restriction on django management commands.  If a command is unknown to the django installation, there will be a concise error produced.

for example:

  tasks:
    - name: invalid command
      django_manage: virtualenv="/valid/virtualenv" app_path="/valid/app_path" command="nowaydude"

Results in:

failed: [hostname] => {"cmd": "python manage.py nowaydude", "failed": true}
msg: stdout: Unknown command: 'nowaydude'
Type 'manage.py help' for usage.

:stderr: Unknown django command: nowaydude
2013-10-18 17:26:10 -07:00
Michael DeHaan
232eb9f8e6 Merge pull request #4595 from mscherer/fix_4563
fix logic in module host to add aliases even if none exist already, fix #4563
2013-10-18 17:09:23 -07:00
Michael DeHaan
b5c34308dd Merge pull request #4594 from mscherer/fix_4587
fix distribution detection in apt_repository module, so it also work on mint as it work on Debian, partially fix #4587
2013-10-18 17:08:35 -07:00
Michael Scherer
d5c290b513 fix logic in module host to add aliases even if none exist already, fix #4563
self._has_aliases is used to know if a alias already exist, but
the test we want is to know if we need to add a new alias, which
is stored in self.aliases
2013-10-19 01:51:42 +02:00
Michael Scherer
19bb44288e fix distribution detection in apt_repository module, so it also work
on Mint as it work on Debian, fix #4587.

PPAs are not supported however, since that's a Ubuntu specific feature
and mint is detected as a generic distribution and use a different
codename than the Ubuntu release it is based on, which mean that apt_repository
cannot add detect and add the proper url without a better heuristic.
2013-10-19 00:57:08 +02:00
Michael Scherer
fc211ac1a0 setup module, replace ':' by '_' in interface name, fix #4586 2013-10-19 00:24:07 +02:00
Peter Sankauskas
b793248df4 Now this disassociates EIPs from instances inside a VPC correctly. Time
for a PR.
2013-10-18 15:12:49 -07:00
James Tanner
3c4dd618e4 Fixes #4454 Make a temporary clean cnf file if unable to parse existing 2013-10-18 17:42:40 -04:00
Peter Sankauskas
0e459f65f0 First round of changes to the EIP module to get it to be able to work well inside a VPC, and to be able to delete EIPs as well 2013-10-18 14:38:58 -07:00
jctanner
92edf99c80 Merge pull request #4562 from nimbis/devel
Adding aws_access_key and aws_secret_key aliases to ec2_group arguments
2013-10-18 06:17:50 -07:00
Brian Schott
bdc8ea828e added aws_access_key and aws_secret_key aliases to ec2_group arguments 2013-10-17 15:23:24 -04:00
jctanner
12eaefb7e6 Merge pull request #4539 from sayap/git-sha1
git: Always return the before/after revisions, even in check mode.
2013-10-17 11:36:03 -07:00
Michael DeHaan
8666f8ea24 Merge pull request #4568 from mmoya/features
Improve change detection in mysql_variables
2013-10-17 10:51:36 -07:00
James Tanner
4f674ec522 Fixes #4554 Enumerate user homedir if not passed as an argument 2013-10-17 13:15:32 -04:00
Maykel Moya
b90a250165 Improve change detection in mysql_variables
mysql_variables bindly executes a SET var = value query even when
the variable already has the requested value.

With this patch the query is executed only if the current value is
different to the requested one.
2013-10-17 19:13:58 +02:00
Thomas Ronner
aee68511e6 Fix illegal set operation in FreeBSD section of user module. 2013-10-17 15:02:23 +00:00
Michael DeHaan
8a516d1479 Various standardization to the proposed gce_storage module to bring things in line with updates to the S3 module.
Some typo fixes.

Further testing required.
2013-10-17 10:49:51 -04:00
Michael DeHaan
4bdf3da25a Merge pull request #4333 from bennojoy/gcs
support for google cloud storage module
2013-10-17 07:35:53 -07:00
Michael DeHaan
baa13a5cc7 Merge pull request #4395 from erjohnso/devel
adding Google Compute Engine modules and inventory plugin
2013-10-17 07:30:55 -07:00
Maykel Moya
2592b2c3f9 Do key validation only when key is provided
key_id is optional, the previous code didn't handle the case of key_id
not specified
2013-10-17 12:04:04 +02:00
jctanner
7e8e186b3b Merge pull request #4517 from adfinis-sygroup/devel
Remove keys regardless of the options
2013-10-16 17:40:43 -07:00
jctanner
c737f222d5 Merge pull request #4480 from joemaller/absent_path_fix
ignore src when file module state=absent
2013-10-16 17:29:21 -07:00
jctanner
51a1a54bfb Merge pull request #4428 from robparrott/devel
Properly handle DEFAULT section with ConfigParser in ini_file modules
2013-10-16 17:18:17 -07:00
James Tanner
23cbdba65e Fixes #4350 Create homedirectory if create=yes and directory is missing 2013-10-16 20:08:41 -04:00
Michael DeHaan
db7e4510f2 Merge pull request #4544 from mmoya/features
apt_key: Validate key_id and accept a leading '0x'
2013-10-16 12:32:28 -07:00
Maykel Moya
1a79d9ae58 apt_key: Validate key_id and accept a leading '0x' 2013-10-16 20:52:18 +02:00
Lorin Hochstein
1c5bdba977 s3: better check for walrus
Check for Walrus endpoint by looking to see if the endpoint is not AWS.

This fixes a bug where the user specifies an AWS endpoint via S3_URL,
but the code interprets it as Walrus and then fails.
2013-10-16 13:22:41 -04:00
James Tanner
807e602228 mysql_db: if connection is a socket, do not specify hostname 2013-10-16 09:59:31 -04:00
James Tanner
84a692bcf7 Fixes #4301 Use module_common functions for mysqldump and return better errors 2013-10-16 09:51:08 -04:00
Yap Sok Ann
8519d586ba git: Don't add --branch while cloning if the version is a SHA-1 hash. 2013-10-16 20:37:07 +08:00
Yap Sok Ann
9f8cdac0aa git: Handle network problem when running git ls-remote. 2013-10-16 20:37:07 +08:00
Yap Sok Ann
a53e7045a6 git: Always return the before/after revisions, even in check mode.
The return values from check mode and non-check mode should match in all cases,
except when a SHA-1 hash is used as version, as there is no way to check if it
is a valid hash using `git ls-remote`.

Also, to accomodate this change, the force flag for the reset function has been
removed so that we can do the checking in main.
2013-10-16 20:37:07 +08:00
Yap Sok Ann
b9558828e8 git: Make function get_remote_head usable when cloning.
This allows the module to return the before/after revisions in all cases.
2013-10-16 20:37:07 +08:00
Yap Sok Ann
2ad4d77c9a git: Remove unnecessary return code checking.
The functions either return rc=0 or call fail_json themselves.
2013-10-16 20:37:06 +08:00
Yap Sok Ann
9af05f4d2f git: Full length SHA-1 in, full length SHA-1 out.
This removes ambiguity at the expense of slight backward incompatibility.
2013-10-16 20:37:06 +08:00
James Tanner
00f3ec645d Fixes #4532 Send easy_install to get_bin_path instead of None 2013-10-15 18:15:08 -04:00
James Tanner
7061c99049 fix indentation in easy_install module docstring 2013-10-15 12:49:43 -04:00
James Cammarata
35284818a9 Handle ssh key files that may only have a type/key specified
If a specified key did not have a comment, it would be ignored as
an invalid key.

Fixes #4513
2013-10-15 09:05:50 -05:00
Stefan Heinemann
af704562a9 Set the options of an authorized key comma separated
According to the sshd man page, no spaces are permitted between the
options of an authorized ssh key
2013-10-15 15:29:52 +02:00
Stefan Heinemann
346d46a94c Don't mind the options of a key when removing it
This allows to remove a key without knowing the options in the
authorized_key file
2013-10-15 15:29:47 +02:00
Mickaël Rémond
007a3fe154 Add executable parameter to find gem binary in gem module
This is especially needed with rvm where gem binary can be in unusual locations
2013-10-15 09:08:33 +02:00
Michael DeHaan
e131de4de0 Added "debug: var=variableName" capability. 2013-10-14 21:01:38 -04:00
Michael DeHaan
84ff24d92c Merge pull request #4346 from dmkoch/digitalocean-droplet-options
Add "virtio" and "private_networking" options for DigitalOcean droplets
2013-10-14 17:05:06 -07:00
Michael DeHaan
8349c04d06 Merge pull request #4488 from renanivo/devel
create install_options parameter for homebrew module
2013-10-14 16:47:59 -07:00
Cove Schneider
5f7e1fc306 Un-camelcase DockerContainers, rename class to DockerManager(). 2013-10-14 13:49:53 -07:00
jctanner
79071aee79 Merge pull request #4470 from jyap808/patch-1
Assume state='directory' if recurse is set and previous state was 'direc...
2013-10-14 13:49:35 -07:00
Michael DeHaan
b8ec300d4c Add note about feature being new in 1.4 2013-10-14 11:57:19 -04:00
Constantine Peresypkin
499a2fe456 add support for disk_config option to cloud/rax module 2013-10-14 11:57:19 -04:00
Michael DeHaan
6ff4806b90 Merge branch 'devel' of git://github.com/shirou/ansible into devel 2013-10-14 11:50:25 -04:00
Pedro Romano
e6062db92f Implement a '_get_easy_install' helper function to find the desired
'easy_install' executable, modeled on '_get_pip'
from the 'pip' module to correctly handle all combinations of explicit
executable and virtualenv.
2013-10-14 11:48:45 -04:00
Pedro Romano
307dd77589 Refactor helper function '_get_pip' to handle the cases where an absolute
path explicit executable is passed to the task and to look for an explicit executable
by basename in a virtualenv if that is specified.
2013-10-14 11:48:28 -04:00
Pedro Romano
57a71043a3 New module argument to specify the executable used for running 'pip'. This allows support for system installation of packages on systems with multiple installations of Python. 2013-10-14 11:48:28 -04:00
Pedro Romano
3c33273071 New module argument to specify the executable used for running 'easy_install'. This allows support for system installation of packages on systems with multiple installations of Python. 2013-10-14 11:48:27 -04:00
Pedro Romano
48e50a9c11 Rename copy/pasted variables more appropriately. 2013-10-14 11:47:59 -04:00
Pedro Romano
5a5d431fa1 Changes examples from using Flask to some other package (Bottle was chosen) as per @mpdehaan's suggestion. 2013-10-14 11:47:59 -04:00
Michael DeHaan
54b5548068 Slight tweak to ovirt module docs. 2013-10-14 11:43:01 -04:00
Michael DeHaan
f6eae5571a Update version_added in ovirt module. 2013-10-14 11:41:24 -04:00
Michael DeHaan
5dd25692d4 Merge pull request #3838 from vincentvdk/ovirt-mod
added new module "ovirt"
2013-10-14 08:40:07 -07:00
Michael DeHaan
de3731a14e Some minor doc updates for the acl module. 2013-10-14 11:36:48 -04:00
Michael DeHaan
658b7d1f47 Merge pull request #3610 from bcoca/acl_module
initial draft acl module
2013-10-14 08:32:10 -07:00
Brian Coca
311892a567 added long names to support older version as per feedback
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-10-14 10:48:30 -04:00
Jurrien Bloemen
55062c69d6 Added full path to rhnreg_ks command for working correctly with sudo. 2013-10-14 16:05:01 +02:00
Keith Buck
36a8312de6 Improve the formatting and content for the sysctl module's description. 2013-10-14 07:16:47 +00:00
Cove Schneider
565db64a04 remove comment about requirements 2013-10-13 21:37:42 -07:00
Cove Schneider
a4922bc74c add requirements back 2013-10-13 21:36:42 -07:00
Cove Schneider
618004f87b clean up a few warnings 2013-10-13 21:34:58 -07:00
Cove Schneider
c51981b5b7 add python requirements to docs 2013-10-13 21:14:27 -07:00
Cove Schneider
fbca1ebc04 add example docs 2013-10-13 20:34:14 -07:00
Cove Schneider
1fe45c4f6c add docker module 2013-10-13 15:07:27 -07:00
Eric Johnson
1b07e7a521 update defaults and help for 'name' and 'instance_names' 2013-10-13 13:48:09 -07:00
Eric Johnson
81b5c93c78 address a few review comments 2013-10-13 13:41:55 -07:00
Renan Ivo
776de30e6d update version_added of homebrew module 2013-10-13 15:32:51 -03:00
Renan Ivo
488fb484b7 set default options value to None in homebrew module 2013-10-13 10:42:12 -03:00
Renan Ivo
dd1b44acd5 create install_options parameter to homebrew module 2013-10-13 10:24:07 -03:00
Michael DeHaan
a130a8e614 Merge pull request #4477 from eggsby/devel
supervisorctl: user expansion on config filepath
2013-10-13 06:22:02 -07:00
Joe Maller
8597bf6bba ignore src when file module state=absent 2013-10-13 01:22:53 -04:00
Thomas Omans
1dbdd9d6d1 supervisorctl: user expansion on config filepath 2013-10-12 15:57:42 -07:00
Michael Scherer
914226afc3 Fix issue 4433, make sure status is a int rather than a string 2013-10-12 22:10:40 +02:00
Harrison Gu
b5500d9a4d Fix bug for setting ec2 tags 2013-10-12 20:57:32 +08:00
Julian Yap
76cec9d360 Assume state='directory' if recurse is set and previous state was 'directory'
Resolves this issue: https://github.com/ansible/ansible/issues/2067
2013-10-11 15:56:14 -10:00
Andrew Pope
6342046da6 Fixed broken force=yes on files for directories 2013-10-11 18:02:18 -04:00
James Cammarata
49130c688d Adding 'unique' option to authorized_key module and cleanup
A small refactoring of the authorized_key module to accomodate these
changes, plus fixing some things like not rewriting the file on every
new key. These changes bring the original feature for ssh options in-
line with the comments in #3798

Fixes #3785
2013-10-11 16:22:37 -05:00
David Minor
ed7d3f92a0 Add ssh key options parameter to authorized_key module 2013-10-11 16:22:37 -05:00
Michael DeHaan
41aaad69aa Make add_host clear the inventory pattern cache, add some more aliases. Fixes #4442. 2013-10-11 16:37:10 -04:00
Andy Kluger
f97871e0d9 Corrected docs ("monitor" -> "monitoring" and dissociated monitoring from instance_tags in examples) 2013-10-11 13:32:23 -04:00
James Tanner
d21a0287a2 Remove all sys.exit calls in the cloud/s3 module
Fixes #4458
2013-10-11 11:28:47 -04:00
jctanner
861779bb6e Merge pull request #4457 from mbarrin/devel
Fixed crash when s3 bucket did not exist for put operation
2013-10-11 08:18:51 -07:00
Matthew Barrington
ce0bf71245 Fixed crash when s3 bucket did not exist for put operation 2013-10-11 16:01:54 +01:00
Jimmy Tang
a4c8d3ee68 This oneliner change allows apt-key to inherit the http_proxy variable.
Before this fix

  TASK: [apt_repository repo='ppa:vbernat/haproxy-1.5'] *************************
  failed: [134.226.115.202] => {"cmd": ["apt-key", "adv", "--recv-keys", "--keyserver", "keyserver.ubuntu.com", "CFFB779AADC995E4F350A060505D97A41C61B9CD"], "failed": true, "rc": 2}
  stderr: gpg: requesting key 1C61B9CD from hkp server keyserver.ubuntu.com
  gpg: no valid OpenPGP data found.
  gpg: Total number processed: 0

After the fix

  TASK: [apt_repository repo='ppa:vbernat/haproxy-1.5'] *************************
  changed: [134.226.115.202]
2013-10-11 15:19:52 +01:00
Michael DeHaan
e4036b1bfc Merge pull request #4342 from pileofrogs/devel
mysql_replication switch to DictCursor for compatibility with more mysql server versions
2013-10-11 06:21:22 -07:00
Michael DeHaan
ce79efc34a Add missing version_added doc to mysql login port parameter. 2013-10-11 09:14:14 -04:00
James Tanner
e3849f1be7 Fixes #4312 for older versions of usermod which do not have --append 2013-10-11 09:10:46 -04:00
Michael DeHaan
119b6d73dd Remove examples of module antipattern of setting the choices array for boolean types. 2013-10-11 08:45:13 -04:00
Andy Kluger
5ce29734d2 Set default of 'yes' for update_cache, as is in the documentation 2013-10-10 17:18:06 -04:00
Dylan Martin
345329b69f toned down the error message for unconfigured master/slave 2013-10-10 09:15:47 -07:00
Mads Weitling
ce799b9e0e Fix Hg.__init__(...) reading value from self.hg_path 2013-10-10 15:46:10 +00:00
Mads Weitling
740a33bcab Fix 'hg module fails with: AttributeError: 'AnsibleModule' object has no attribute 'parames'' 2013-10-10 17:15:04 +02:00
Michael DeHaan
8d16a39af9 Correct typo 2013-10-10 09:15:04 -04:00
Robert Parrott
54aeaaf486 small change ... in order to get changed signal correct, move DEFAULT section test upward. 2013-10-10 09:10:00 -04:00
Boris Kaul
5a34e572f5 Add support for Rich Rules in firewalld module 2013-10-10 20:09:52 +07:00
Robert Parrott
762135915c fix handling of [DEFAULT] section by ConfigParser. it is there by DEFAULT. 2013-10-10 09:01:00 -04:00
Michael DeHaan
35a3419bee Merge pull request #4423 from localvoid/firewalld-fix_timeout
Fix timeout bug in firewalld module
2013-10-10 05:46:18 -07:00
Michael DeHaan
987bf9e451 Merge pull request #4422 from bennojoy/nova1
nova compute fix for instance name regex issue
2013-10-10 05:45:40 -07:00
Boris Kaul
194a7dab9f Fix timeout bug in firewalld module 2013-10-10 13:41:42 +07:00
bennojoy
40565ef236 nova compute fix regex in instance name 2013-10-10 11:44:30 +05:30
Jim Kleckner
f231c86ff3 Add detail to copy module validate argument
This clarifies the validate command argument and makes it clear that if
it is present, it must include the '%s' argument for the path to the
temporary file to validate.
2013-10-09 18:21:43 -07:00
Joost Cassee
bd10aad71f Add in a retry loop for route53 requests
The route53 api doesn't allow multiple overlapping requests, so if
it is still processing a previous request when the next comes in will
return an error.

Fixes #4085
2013-10-09 12:50:41 -05:00
James Tanner
c679491ece #4408 s3: add force alias for overwrite and set True by default 2013-10-09 12:56:56 -04:00
James Tanner
c55107fa83 Remove debug comment from s3 module 2013-10-09 12:25:09 -04:00
James Tanner
9c3fb9c2b7 4006: return s3 url even if file exists 2013-10-09 12:12:24 -04:00
Javier Candeira
f8255b538e fix django_manage migrate command 2013-10-10 00:57:01 +11:00
Michael DeHaan
0e55bd892d For values that are booleans in the module doc, the value in the doc section should be a boolean or truthiness
is engaged in the documentation formatting.  This fixes the update_cache default in the docs to the proper
value of "no"
2013-10-09 07:52:23 -04:00
Michael DeHaan
203a4f10cd Use explicit boolean defaults in apt module to make the code more clear. 2013-10-09 07:47:24 -04:00
James Tanner
b7f229d390 Second attempt at preventing ipv6 route enumeration on EL4 machines 2013-10-08 18:40:15 -04:00
James Tanner
4b1600aae5 Revert "Do not enumerate ipv6 routes in CentOS 4"
This reverts commit 5186c408f7.
2013-10-08 15:51:12 -04:00
James Tanner
5186c408f7 Do not enumerate ipv6 routes in CentOS 4 2013-10-08 15:12:38 -04:00
Eric Johnson
cfc249931a custom user-agent header 2013-10-08 16:36:35 +00:00
Michael DeHaan
d803ce7ab3 Fix documentation of default value in s3 module. Fixes #4289 2013-10-08 08:42:03 -04:00
Michael DeHaan
ce0efc8e25 Fix typo, relative to absolute, fixes #4126 2013-10-08 08:40:22 -04:00
Michael DeHaan
135f79f337 Add documentation about how passwords are generated. 2013-10-08 08:36:48 -04:00
Eric Johnson
9ca824c16d adding Google Compute Engine modules and inventory plugin 2013-10-07 21:01:37 +00:00
James Cammarata
a2ac5d6df2 Better detection/categorization of ipv4 secondaries/virtual IPs
Fixes #3916
Fixes #3478
2013-10-07 15:18:33 -05:00
Michael DeHaan
0e909640c5 Make group_id be a list. 2013-10-07 15:34:35 -04:00
Michael DeHaan
c5672cf16e Merge pull request #4389 from MattTheRat/devel
addresses #4371 - adds -m to usermod commands
2013-10-07 12:15:20 -07:00
Matt Warren
74c412e249 addresses https://github.com/ansible/ansible/issues/4371 - adding -m to home directory modification 2013-10-07 10:47:12 -04:00
Michael DeHaan
686d998b26 Merge pull request #4368 from sayap/ec2_ami
ec2_ami: Account for AWS's "eventual consistency" with AMI creation.
2013-10-07 06:09:34 -07:00
Michael DeHaan
8604212da9 Merge pull request #4352 from jhoekx/mysql-user-grant
Add grant parameter to MySQL user module
2013-10-07 06:08:39 -07:00
Michael DeHaan
709993aa27 Merge pull request #4334 from bennojoy/s3
minor fixes
2013-10-07 06:02:09 -07:00
Michael DeHaan
39a81c4361 Merge pull request #4300 from psvo/cloudformation_results_fix
Fail cloudformation operation when it is not completed successfully
2013-10-07 06:01:40 -07:00
Benno Joy
c1198dc12c change "Changed" to changed 2013-10-07 18:29:03 +05:30
Michael DeHaan
f6c3dce497 Merge pull request #4336 from orkaa/devel
Fixes service update-rc.d functionality on debian
2013-10-07 05:56:43 -07:00
Michael DeHaan
a8902e878c Merge pull request #4347 from sashka/devel
Remove options and protocols in source line with regex.
2013-10-07 05:55:43 -07:00
Michael DeHaan
4826d4b87a Merge pull request #4309 from ryanaudiencepi/monit_fix
Fix monit uppercase and restart problem
2013-10-07 05:49:38 -07:00
Michael DeHaan
42e84e1b34 Merge pull request #4264 from wulczer/fix-linode-param-type
The payment term param in the Linode module is an int.
2013-10-07 05:48:37 -07:00
Michael DeHaan
8dae9fa5e7 Fix module formatting in the pkgutil module. 2013-10-07 08:24:02 -04:00
Michael DeHaan
37970112d9 Add "from" as an alias to "msg_from" in the hipchat module, to match docs. 2013-10-07 08:15:11 -04:00
Joshua Kehn
cc0c908cee Added validate option to lineinfile
The validate option is constructed similarly to the template command's
validate option. TestRunner.py has been updated to include two new
tests, one for passing and one for failing validation.
2013-10-06 13:51:27 -04:00
Michael DeHaan
b74d9bbc90 Merge pull request #4364 from stoned/pre-1.6-passlib
Fix compatibility issue with passlib version < 1.6 (as encountered on eg...
2013-10-04 14:47:18 -07:00