rallytime 7dc1e770c4 Merge branch '2018.3' into 'develop' ... Conflicts: - doc/topics/installation/freebsd.rst - salt/cloud/clouds/oneandone.py - salt/grains/core.py - salt/modules/napalm_ntp.py - salt/modules/win_update.py - salt/modules/win_wua.py - salt/modules/zabbix.py - salt/renderers/pass.py - salt/states/vault.py - tests/unit/states/test_win_update.py		2018-06-06 13:35:36 -04:00
..
batch.rst	add versionadded	2016-04-01 18:18:54 +02:00
compound.rst	Mention nodegroups in the list of compound matchers	2018-02-02 18:05:01 +01:00
globbing.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
grains.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
index.rst	Merge branch '2016.11' into 'develop'	2017-02-28 17:14:40 -07:00
ipcidr.rst	CIDR matching supports IPv6, update docs	2017-03-09 13:52:13 +01:00
nodegroups.rst	update docs to reference new feature	2018-05-08 09:42:23 -04:00
pillar.rst	[2016.3] Merge forward from 2015.8 to 2016.3 (#32784)	2016-04-25 15:26:09 -06:00
range.rst	Improve the Top File matching docs	2017-03-03 10:40:22 -06:00