rallytime 513058945c Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/states/requisites.rst - doc/topics/cloud/profitbricks.rst - doc/topics/cloud/vsphere.rst - doc/topics/releases/0.9.8.rst - doc/topics/releases/releasecandidate.rst - salt/cloud/clouds/vsphere.py - salt/minion.py - salt/states/archive.py - tests/unit/states/archive_test.py		2016-12-19 14:58:39 -07:00
..
batch.rst	add versionadded	2016-04-01 18:18:54 +02:00
compound.rst	Update compound matcher docs to clarify the usage of alternate delimiters	2015-10-05 17:29:39 -06:00
globbing.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
grains.rst	Merge branch '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
index.rst	[2016.3] Remove "Targeting with Executions" section from docs (#36926)	2016-10-11 16:34:08 -06:00
ipcidr.rst	Spelling error	2015-02-16 12:05:47 +01:00
nodegroups.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
pillar.rst	[2016.3] Merge forward from 2015.8 to 2016.3 (#32784)	2016-04-25 15:26:09 -06:00
range.rst	Comma cleanup	2014-12-12 11:39:55 -08:00