summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cleanup some minor issues in PluginLoader:pluginloader-cleanupsToshio Kuratomi2016-03-211-17/+31
* Merge pull request #14976 from xiaket/develToshio Kuratomi2016-03-211-2/+7
|\
| * import the base class and check whether this obj has the required base class.夏恺(Xia Kai)2016-03-211-2/+7
| * use __mro__ for plugin loading when we search for its base class.夏恺(Xia Kai)2016-03-151-1/+1
* | Merge pull request #13377 from bruceharbin/patch-1Brian Coca2016-03-211-0/+2
|\ \
| * | Update intro_windows.rstMing Qian2015-12-011-0/+2
* | | Merge pull request #14730 from chouseknecht/docker_image_proposalBrian Coca2016-03-211-0/+207
|\ \ \
| * | | Upated docker_image_module proposalchouseknecht2016-03-021-0/+207
* | | | Merge pull request #14733 from chouseknecht/docker_files_proposalBrian Coca2016-03-211-0/+159
|\ \ \ \
| * | | | Adding docker_files module proposalchouseknecht2016-03-021-0/+159
* | | | | Merge pull request #14471 from willdurand/contrib-do-inventoryBrian Coca2016-03-212-9/+23
|\ \ \ \ \
| * | | | | [contrib] Add option to define group vars in DigitalOcean dynamic inventory s...William Durand2016-02-142-9/+23
* | | | | | Merge pull request #15065 from hyperized/develBrian Coca2016-03-212-3/+3
|\ \ \ \ \ \
| * | | | | | Proposed change to documentation to elaborate on new notation style for with_...Gerben Geijteman2016-03-212-3/+3
|/ / / / / /
* | | | | | Merge pull request #15006 from ansible/local-pipeliningToshio Kuratomi2016-03-201-4/+3
|\ \ \ \ \ \
| * | | | | | Add changes necessary for enabling pipelining for local connectionslocal-pipeliningToshio Kuratomi2016-03-161-4/+3
* | | | | | | Merge pull request #15052 from mattclay/travis-docker-sshJames Cammarata2016-03-206-0/+40
|\ \ \ \ \ \ \
| * | | | | | | Combine new RUN commands into one RUN command.Matt Clay2016-03-206-28/+28
| * | | | | | | Add ssh client and server to docker containers.Matt Clay2016-03-196-0/+40
* | | | | | | | Change url so that we don't test https in the tests for file permsToshio Kuratomi2016-03-201-2/+2
* | | | | | | | Fixing role param precedence issuesJames Cammarata2016-03-202-9/+9
* | | | | | | | Update to latest git submodulesToshio Kuratomi2016-03-202-12/+14
* | | | | | | | Add integration test for #11821Toshio Kuratomi2016-03-201-0/+34
* | | | | | | | Merge pull request #15049 from mattclay/paramiko-unicodeToshio Kuratomi2016-03-191-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing to_bytes for cmd.Matt Clay2016-03-191-0/+2
| |/ / / / / / /
* | | | | | | | Fix small error (thse => these)Michael Scherer2016-03-201-1/+1
* | | | | | | | Merge pull request #14679 from dagwieers/merge_hash_v2James Cammarata2016-03-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid merging a dict and a AnsibleUnicodeDag Wieers2016-02-261-1/+1
* | | | | | | | | Merge pull request #14508 from brianlycett/patch-1James Cammarata2016-03-191-2/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update YAMLSyntax.rstbrianlycett2016-02-291-1/+1
| * | | | | | | | | Update YAMLSyntax.rstbrianlycett2016-02-291-2/+2
| * | | | | | | | | Update YAMLSyntax.rstbrianlycett2016-02-241-6/+9
| * | | | | | | | | Update YAMLSyntax.rstbrianlycett2016-02-161-2/+37
* | | | | | | | | | Merge branch 'a13m-destination_format' into develJames Cammarata2016-03-192-1/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'destination_format' of https://github.com/a13m/ansible into a13...James Cammarata2016-03-192-1/+22
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / /
| * | | | | | | | | Flexible tag-based naming for ec2 hostsAndy Grimm2015-07-282-1/+20
* | | | | | | | | | Merge pull request #13550 from KrzysiekJ/connect_to_region-wrapBrian Coca2016-03-181-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use wrapped connect_to_region everywhere in ec2.pyKrzysztof Jurewicz2015-12-151-2/+2
* | | | | | | | | | | minor changelog updatesBrian Coca2016-03-181-2/+3
* | | | | | | | | | | Merge pull request #14872 from bcoca/ec2_inv_page_rdsBrian Coca2016-03-181-3/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | page rds instancesBrian Coca2016-03-181-3/+8
* | | | | | | | | | | | Merge pull request #15042 from RNanney/RNanney-validate_certsBrian Coca2016-03-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update nxos.pyRNanney2016-03-181-0/+1
* | | | | | | | | | | | | Merge pull request #15043 from mattclay/docker-userToshio Kuratomi2016-03-181-33/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use docker exec -u when needed and if supported.Matt Clay2016-03-181-33/+69
* | | | | | | | | | | | | | changelog: add cloudflare_dnsRene Moser2016-03-191-0/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #14964 from keedya/develJames Cammarata2016-03-181-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug FixAndre Keedy2016-03-141-4/+6
* | | | | | | | | | | | | Renaming per-item and retry callbacksJames Cammarata2016-03-188-29/+32
* | | | | | | | | | | | | Merge pull request #14993 from karmab/ovirt_connection_fixToshio Kuratomi2016-03-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \