rallytime
|
f6d9cdc633
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- doc/ref/states/compiler_ordering.rst
- doc/topics/installation/suse.rst
- doc/topics/jobs/schedule.rst
- doc/topics/targeting/grains.rst
- doc/topics/tutorials/preseed_key.rst
- doc/topics/tutorials/states_pt5.rst
- pkg/suse/use-forking-daemon.patch
- salt/minion.py
- salt/modules/pacman.py
- salt/modules/state.py
- salt/modules/yumpkg.py
|
2016-03-25 11:47:16 -06:00 |
|
Justin Findlay
|
8de84b4251
|
update suse master service patch
Fixes #780.
|
2016-03-23 16:03:12 -06:00 |
|
Niels Abspoel
|
8d796e6732
|
update suse spec file to 2015.8.1
|
2015-10-18 12:24:09 +02:00 |
|
Niels Abspoel
|
faaeb57759
|
Updated spec file to 2014.1.13
|
2014-10-27 22:47:30 +01:00 |
|
Niels Abspoel
|
5fd3ef480f
|
updated salt.spec file for suse:
this fixes #16560
|
2014-10-11 20:29:52 +02:00 |
|
Niels Abspoel
|
d9bfda2dcd
|
This fixes two issues #14337 and #13788
use-forking-daemon.patch -> #14337
the other patchesr are for #13788
With thanks to Tim Serong who created the patches.
|
2014-07-29 20:34:12 +02:00 |
|