Commit graph

19793 commits

Author SHA1 Message Date
Jason McKerr
8a3f3b96c0 Merge pull request #16105 from mckerrj/devel
2.2 Roadmap and moving Roadmap into docsite with links from root roadmap file.
2016-06-02 17:32:55 -04:00
James Cammarata
273a965dcc Fix the way host and group vars are loaded
* In the VariableManager, we were not properly tracking if a file
  had already been loaded, so we continuously append data to the end
  of the list there for host and group vars, meaning large sets of data
  are duplicated multiple times
* In the inventory, we were merging the host/group vars with the vars
  local to the host needlessly, as the VariableManager already handles that.
  This leads to needless duplication of the data and makes combining the
  vars in VariableManager take even longer.
2016-06-02 16:52:37 -04:00
Jason McKerr
50591757fc Merge branch 'devel' of github.com:mckerrj/ansible into devel 2016-06-02 16:17:13 -04:00
Jason McKerr
d170d5b5c0 Update ROADMAP_2_2.rst 2016-06-02 16:17:01 -04:00
Jason McKerr
d4b9740391 Update ROADMAP_2_2.rst 2016-06-02 16:17:01 -04:00
Jason McKerr
e109f6f3b2 Update ROADMAP_2_2.rst 2016-06-02 16:17:01 -04:00
Jason McKerr
7a8227deb6 Update ROADMAP_2_2.rst 2016-06-02 16:17:01 -04:00
Adrian Likins
ef78e3019d formatting 2016-06-02 16:17:01 -04:00
Adrian Likins
1ce266ebc3 formatting 2016-06-02 16:17:01 -04:00
Adrian Likins
b24b4fae47 formatting 2016-06-02 16:17:01 -04:00
Jason McKerr
8305f0c506 Update ROADMAP_2_2.rst 2016-06-02 16:17:01 -04:00
Jason McKerr
743390d1e2 Update ROADMAP.rst 2016-06-02 16:17:01 -04:00
Jason McKerr
32aa7a8ffa Update ROADMAP.rst
more formatting. I suck at RST.
2016-06-02 16:17:01 -04:00
Jason McKerr
805955c734 Update ROADMAP_2_2.rst
formatting
2016-06-02 16:17:01 -04:00
Jason McKerr
e59abc6f2a Update ROADMAP.rst 2016-06-02 16:17:01 -04:00
Jason McKerr
b6dc7f008b Update ROADMAP_2_2.rst 2016-06-02 16:17:01 -04:00
Jason McKerr
a0e0a2f7c2 Update ROADMAP.rst
formatting stuff
2016-06-02 16:17:01 -04:00
Jason McKerr
868878c4e1 adding docs for individual roadmap docs. Adding subdir in docsite for
them. removing md file
2016-06-02 16:17:01 -04:00
Jason McKerr
1d50edd395 removing md version of roadmap 2016-06-02 16:16:01 -04:00
Jason McKerr
619b5e0e84 changing to RST format. Simplifying this as a top level document that
links to working roadmaps by verision
2016-06-02 16:15:22 -04:00
Jason McKerr
58b431e02f Merge branch 'mckerrj-devel' into devel 2016-06-02 14:24:21 -04:00
Michael Scherer
f0023610e8 Fix bin/ansible to not make a double traceback on python3 (#15972) 2016-06-02 09:49:22 -07:00
Bede Carroll
805e0ec529 Add validate_certs to vmware doc fragment (#16096) 2016-06-02 10:21:39 -04:00
Hrishikesh Barua
6354f0292b Update intro_configuration.rst (#16093)
Fix for #16092
2016-06-02 10:06:56 -04:00
Matt Clay
c9a5b1c555 Merge pull request #16000 from mattclay/shippable
Add support for full CI on shippable.com.
2016-06-01 23:24:45 -07:00
Matt Clay
b0e1efbd62 Add full support for Shippable CI. 2016-06-01 22:33:38 -07:00
Jason McKerr
6746d7928e Update ROADMAP_2_2.rst 2016-06-01 18:56:39 -04:00
Jason McKerr
c3198aa0ed Update ROADMAP_2_2.rst 2016-06-01 18:56:17 -04:00
Jason McKerr
87560a1ffc Update ROADMAP_2_2.rst 2016-06-01 18:55:16 -04:00
Jason McKerr
0a0c4f5aaa Update ROADMAP_2_2.rst 2016-06-01 18:54:53 -04:00
Jason McKerr
ecbdfeab23 Merge pull request #1 from alikins/mc-devel
formatting
2016-06-01 18:54:06 -04:00
Adrian Likins
0c629cb577 formatting 2016-06-01 18:35:24 -04:00
Adrian Likins
75d31b7a87 formatting 2016-06-01 18:32:46 -04:00
Adrian Likins
58f5624a4f formatting 2016-06-01 18:20:33 -04:00
Rene Moser
e3a5c5bd08 doc: changelog: new module netconf_config
See https://github.com/ansible/ansible-modules-extras/pull/2103
2016-06-01 23:16:20 +02:00
Jason McKerr
125d9838f1 Update ROADMAP_2_2.rst 2016-06-01 17:10:43 -04:00
Rene Moser
72d5416c40 doc: changelog: new module letsencrypt 2016-06-01 23:05:29 +02:00
Jason McKerr
a1cb25e0b7 Update ROADMAP.rst 2016-06-01 16:59:16 -04:00
Jason McKerr
907bdf95ca Update ROADMAP.rst
more formatting. I suck at RST.
2016-06-01 16:58:55 -04:00
Toshio Kuratomi
08fd017d99 Test file needed to be renamed 2016-06-01 13:50:57 -07:00
Jason McKerr
08b08da614 Update ROADMAP_2_2.rst
formatting
2016-06-01 16:46:38 -04:00
Jason McKerr
a81dd10646 Update ROADMAP.rst 2016-06-01 16:44:35 -04:00
Duncan Lock
05dd07c97c Two minor grammar fixes (#16090)
* 'putting a playbook on a crontab' -> 'putting a playbook in a crontab'
* `tasks marked as "run_once" will be ran on one host in *each* serial batch.` -> `tasks marked as "run_once" will be run on one host in *each* serial batch.`
2016-06-01 16:36:18 -04:00
Toshio Kuratomi
2a5ef4496a Workaround test failures on OSX controllers for now -- will have to look
more heavily into normailizing the unicode later.
2016-06-01 13:35:11 -07:00
Matt Clay
7edfeb3665 Add junit callback plugin. (#16089)
Add junit callback.
2016-06-01 13:34:00 -07:00
Toshio Kuratomi
f86df7c88b Test that task.args are also set properly (#15950) 2016-06-01 13:28:57 -07:00
Jason McKerr
570f6ed4ab Update ROADMAP_2_2.rst 2016-06-01 16:08:16 -04:00
Jason McKerr
17ca68ff0e Update ROADMAP.rst
formatting stuff
2016-06-01 16:02:41 -04:00
Jason McKerr
15321960be adding docs for individual roadmap docs. Adding subdir in docsite for
them. removing md file
2016-06-01 15:55:35 -04:00
Jason McKerr
b44fa00d33 changing to RST format. Simplifying this as a top level document that
links to working roadmaps by verision
2016-06-01 15:54:24 -04:00