Commit Graph

14 Commits

Author SHA1 Message Date
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
Jacob Hammons
8ec5d989ad 2015.8.8 release docs 2016-03-23 14:00:30 -06:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
2016-02-25 12:36:22 -07:00
Denys Havrysh
172f34a6ca Correct headers in Debian/Ubuntu/SUSE install instructions 2016-02-25 11:51:40 +02:00
Niels Abspoel
b55625c42a fix minor inconsistencies tampakrap suggested 2016-01-19 20:17:22 +01:00
Niels Abspoel
7ec32b2484 update suse information regarding to repositories 2016-01-16 12:16:10 +01:00
Jacob Hammons
ac3bd47440 states/pkgrepo examples, suse installation updates
Refs #26644
Refs #26638
2015-09-02 11:37:40 -06:00
Jacob Hammons
992edc3bb8 Doc bug fixes
Refs #26192
Refs #26638
Refs #26644
Refs #26108
2015-08-31 16:05:50 -06:00
Colton Myers
c2eed77691 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-18 17:07:15 -06:00
dumol
379c09c3a5 Updated for SLES 12.
Added updated instructions for latest SLES release, using the relevant repo.
2015-05-18 13:11:42 -06:00
Thomas Jackson
0f4a23b93a Trailing whitespace cleanup 2014-12-11 07:53:19 -08:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Niels Abspoel
314f5724cc Updated suse installation documentation
With upcoming opensuse 13.1 release and the release of
Suse Linux Enterprise 11 SP3 it was time to update the documentation
2013-09-22 13:06:27 +02:00
Colton Myers
ce56ca0820 Add docs for SUSE installation 2013-05-01 16:48:16 -06:00