rallytime 2c4668a5cb Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/kubernetes.py - salt/states/netconfig.py - salt/states/zfs.py - tests/integration/cloud/providers/test_profitbricks.py - tests/integration/scheduler/test_eval.py - tests/unit/grains/test_core.py - tests/unit/test_pillar.py		2018-03-27 11:57:29 -04:00
..
all	Merge branch '2018.3' into 'develop'	2018-03-27 11:57:29 -04:00
aggregate.rst	Adjust test mocking to handle __utils__['state.check_result']	2017-09-01 16:09:59 -04:00
altering_states.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
backup_mode.rst	Remove ":doc:" references in salt/* files	2016-12-15 14:03:56 -07:00
compiler_ordering.rst	Merge branch '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
extend.rst	Fix 'if if' pattern in docs and comments	2016-09-28 13:12:44 +03:00
failhard.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
global_state_arguments.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
highstate.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
include.rst	Remove ":doc:" references from all doc/topics/releases/* files	2016-12-15 16:45:51 -07:00
index.rst	docs: fix typo in states/index.rst	2017-03-30 04:41:04 -07:00
layers.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
master_side.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
ordering.rst	doc.ref.states.ordering: clarify requisite change (#32934)	2016-04-28 15:41:01 -06:00
parallel.rst	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
providers.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
requisites.rst	Claryfing the documentation for the new require_any requisite.	2018-03-13 09:28:14 -07:00
startup.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
testing.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
top.rst	Merge branch '2016.11' into 'develop'	2017-03-10 14:57:31 -07:00
vars.rst	documentation fix issue 31844	2016-03-29 09:11:29 -06:00
writing.rst	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00