rallytime 39b49621ad Merge branch '2015.8' into 'develop' ... Conflicts: - salt/beacons/service.py - salt/cloud/clouds/vmware.py - salt/modules/file.py - salt/modules/ipset.py - salt/modules/npm.py - salt/modules/rpm.py - salt/states/file.py - salt/utils/event.py - salt/utils/schedule.py - tests/unit/modules/state_test.py		2016-01-14 13:33:53 -07:00
..
access_control.rst	Merge branch '2015.8' into 'develop'	2016-01-14 13:33:53 -07:00
index.rst	Update index.rst	2015-12-28 10:47:40 -07:00