summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable py34 test in travis so we don't regress recent fixespy3-testToshio Kuratomi2015-08-272-2/+6
* Merge pull request #12119 from mgedmin/py3kToshio Kuratomi2015-08-2748-120/+114
|\
| * Fix assert statement syntaxMarius Gedminas2015-08-271-2/+2
| * Disable compileall test for contrib/ in tox -e py34Marius Gedminas2015-08-271-1/+1
| * Use 0oNNN octal syntax in test/Marius Gedminas2015-08-271-12/+12
| * Support print() function in test/Marius Gedminas2015-08-274-5/+5
| * Use 'except ... as' syntax in contrib/ and test/ tooMarius Gedminas2015-08-2714-25/+25
| * Fix to_bytes(None) on Python 3Marius Gedminas2015-08-271-1/+1
| * Avoid types.NoneTypeMarius Gedminas2015-08-275-14/+8
| * Support print as a functionMarius Gedminas2015-08-271-0/+0
| * Drop the L suffix on numerical constantsMarius Gedminas2015-08-271-7/+7
| * Use 0oNNN octal syntaxMarius Gedminas2015-08-272-2/+2
| * Don't mix tabs and spacesMarius Gedminas2015-08-271-1/+1
| * Use 'except ... as' syntaxMarius Gedminas2015-08-2724-51/+51
|/
* ported module_docs to use displayBrian Coca2015-08-271-4/+10
* be more tolerant with non list descriptionsBrian Coca2015-08-271-2/+8
* Merge pull request #12112 from amenonsen/vault-stdioToshio Kuratomi2015-08-275-99/+145
|\
| * Update ansible-vault manpage to describe new encrypt/decrypt behaviourAbhijit Menon-Sen2015-08-272-9/+49
| * More helpful prompts from ansible-vault encrypt/decryptAbhijit Menon-Sen2015-08-272-10/+17
| * Also support output to stdout with no argumentsAbhijit Menon-Sen2015-08-271-7/+8
| * Implement cat-like filtering behaviour for encrypt/decryptAbhijit Menon-Sen2015-08-273-22/+43
| * Fix add_option indentation for consistency before adding another optionAbhijit Menon-Sen2015-08-271-2/+2
| * Simplify VaultEditor methodsAbhijit Menon-Sen2015-08-271-56/+41
| * Don't create a VaultLib in each method; do it in __init__ insteadAbhijit Menon-Sen2015-08-271-18/+10
* | Merge pull request #12078 from amenonsen/hash_mergeToshio Kuratomi2015-08-273-0/+59
|\ \
| * | Add a combine filter with documentationAbhijit Menon-Sen2015-08-273-0/+59
* | | Version bump for v2.0.0-0.1.alpha1 and submodule updatesv2.0.0-0.1.alpha1James Cammarata2015-08-274-13/+17
* | | Better way to stop tox running on unwanted directoriesToshio Kuratomi2015-08-271-3/+3
* | | Merge pull request #12098 from mgedmin/fix-tox-compileallToshio Kuratomi2015-08-271-3/+3
|\ \ \ | |/ / |/| |
| * | Don't compile .py files under .tox/Marius Gedminas2015-08-261-3/+3
* | | Merge pull request #12126 from amenonsen/vault-aes-deprecateBrian Coca2015-08-272-35/+4
|\ \ \
| * | | Update Vault tests to make sure AES decryption worksAbhijit Menon-Sen2015-08-271-2/+3
| * | | Remove deprecated and unused VaultAES encryption codeAbhijit Menon-Sen2015-08-271-33/+1
* | | | Merge pull request #12114 from ilya-epifanov/develJames Cammarata2015-08-272-9/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | fixed hostvars access in conjunction with --limit usageIlya Epifanov2015-08-272-9/+11
* | | | remove old dead codeBrian Coca2015-08-27187-33809/+0
| |/ / |/| |
* | | merged vmware_: vmkernel_ip_config, dvswitch, host, vmkernel, and dvs_portgroupChrrrles Paul2015-08-261-0/+5
* | | make sure delimiter is basestring for cvsfileBrian Coca2015-08-261-2/+2
|/ /
* | Finishing off porting of chroot connection pluginJames Cammarata2015-08-261-11/+18
* | Fix synchronize lookup of localhost infoToshio Kuratomi2015-08-261-1/+4
* | Implement max_fail_percentage and any_errors_fatal supportJames Cammarata2015-08-263-3/+36
* | Add float and percent types for FieldAttributesJames Cammarata2015-08-262-1/+9
* | Merge pull request #12109 from docschick/develBrian Coca2015-08-261-2/+3
|\ \
| * | ansible-lockdown added, minor editingSandra Wills2015-08-261-2/+3
|/ /
* | always load vars pluginsBrian Coca2015-08-261-1/+1
* | Merge pull request #12106 from amenonsen/vault-cleanupsToshio Kuratomi2015-08-263-78/+51
|\ \
| * | Make the filename the first argument to rekey_fileAbhijit Menon-Sen2015-08-263-3/+3
| * | Update tests for VaultEditor API changesAbhijit Menon-Sen2015-08-261-9/+9
| * | Pass the filename to the individual VaultEditor methods, not __init__Abhijit Menon-Sen2015-08-262-45/+39
| * | Remove inaccurate outdated commentAbhijit Menon-Sen2015-08-261-4/+0