rallytime a2927226ea Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/modules/all/salt.modules.napalm_route.rst - doc/ref/modules/all/salt.modules.napalm_snmp.rst - doc/ref/modules/all/salt.modules.napalm_users.rst - doc/ref/states/all/salt.states.netsnmp.rst - doc/ref/states/all/salt.states.netusers.rst - salt/states/cron.py		2016-12-22 12:15:06 -07:00
..
all	Merge branch '2016.11' into 'develop'	2016-12-22 12:15:06 -07:00
aggregate.rst	Remove ":doc:" references from all doc/topics/releases/* files	2016-12-15 16:45:51 -07: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	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -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
providers.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
requisites.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -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.3' into '2016.11'	2016-12-19 14:58:39 -07:00
vars.rst	documentation fix issue 31844	2016-03-29 09:11:29 -06:00
writing.rst	Merge branch '2016.3' into 'develop'	2016-08-26 14:54:54 -06:00