Colton Myers 69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/man/salt.7 doc/topics/ssh/index.rst salt/modules/boto_secgroup.py salt/modules/dockerng.py salt/states/archive.py salt/states/boto_elb.py salt/states/boto_secgroup.py tests/unit/modules/schedule_test.py		2015-10-07 13:11:48 -06:00
..
logging	default log_level is info, not warning	2015-09-18 13:59:45 -07:00
examples.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5	2015-08-10 10:56:40 -06:00
master.rst	initial engines topic, updates to windows repo docs	2015-10-05 14:22:59 -06:00
minion.rst	log_level default is info	2015-09-18 13:59:01 -07:00
nonroot.rst	Comma cleanup	2014-12-12 11:34:34 -08:00