Commit Graph

4 Commits

Author SHA1 Message Date
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
Niels Abspoel
8d796e6732 update suse spec file to 2015.8.1 2015-10-18 12:24:09 +02:00
Niels Abspoel
f72aa06d54 updated salt.spec file for suse update 0.15.90
Improved salt init files to match fedora package
These could be merged into one.
replaced service files for symlinks to match fedora package
added README.suse to reflect package names for addition python modules
2013-06-22 08:03:28 +02:00