rallytime 7aa31ff030 Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/grains/core.py - salt/modules/git.py - salt/modules/pillar.py - salt/states/saltmod.py - salt/states/user.py - tests/integration/states/handle_iorder.py		2017-07-18 09:05:43 -06:00
..
index.html	Updates to salt-ssh and salt-key	2015-08-31 20:00:30 -06:00
index.rst	Merge branch '2016.11' into '2017.7'	2017-07-18 09:05:43 -06:00
roster.rst	add note about roster_defaults	2017-07-05 10:23:07 -06:00