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
Jacob Hammons
03c51bb54d
Added placeholder release notes for 2015.5.10
...
Changed old doc links from docs.saltstack.org to docs.saltstack.com
2016-01-22 10:48:08 -07:00
Benjamin Bergia
675a309e15
Add a method context containing the path
2015-07-11 10:12:24 +08:00
mguegan
8ba8138bc4
pkg/smartos : fix the manifest of salt-master to start@boot
2013-05-30 20:33:16 +02:00
mguegan
89de6a1606
smartos : change default config directory for Salt services
2013-05-20 13:00:38 +02:00
mguegan
737b4e0fb2
pkg/smartos : add compatible manifests for the SmartOS platform
...
Manifests in pkg/solaris are using /etc/salt which is innapropriate
for SmartOS design (/etc is removed @reboot). I suggest to add a
new directory in order to preserve existing Solaris installations
(and SmartOS one which are based on those manifests).
2013-05-13 22:17:35 +02:00
