rallytime 4fa80f2d5e Merge branch '2015.8' into 'develop' ... Conflicts: - doc/ref/states/all/index.rst - salt/cloud/__init__.py - salt/minion.py - salt/modules/file.py - salt/modules/guestfs.py - salt/modules/ipmi.py - salt/modules/osquery.py - salt/modules/parted.py - salt/modules/seed.py - salt/modules/virt.py - salt/modules/yumpkg.py - salt/modules/zypper.py - salt/states/boto_elb.py - salt/states/pkg.py		2016-01-26 16:19:39 -07:00
..
access_control.rst	Merge branch '2015.8' into 'develop'	2016-01-14 13:33:53 -07:00
index.rst	Merge branch '2015.8' into 'develop'	2016-01-26 16:19:39 -07:00