rallytime 031a75ca33 Merge branch '2015.8' into '2016.3' ... Conflicts: - Contributing.rst - conf/master - doc/index.rst - doc/man/salt.7 - pkg/suse/README.suse - salt/client/ssh/state.py - salt/minion.py - salt/modules/zypper.py - salt/utils/schedule.py - tests/unit/modules/zypper_test.py		2016-03-02 10:26:13 -07:00
..
batch.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
compound.rst	Update compound matcher docs to clarify the usage of alternate delimiters	2015-10-05 17:29:39 -06:00
globbing.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
grains.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
ipcidr.rst	Spelling error	2015-02-16 12:05:47 +01:00
nodegroups.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
pillar.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
range.rst	Comma cleanup	2014-12-12 11:39:55 -08:00