valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,138 Commits 24 Branches 182 Tags 341 MiB
bfded5c401
Commit Graph

5798 Commits

Author SHA1 Message Date
Todd Wells
bfded5c401 documentation-fix-31931 2016-03-28 15:08:44 -07:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
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
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Jacob Hammons
21eee08842 Added known issues 32004 and 32044 to 2015.8.8 release notes 2016-03-24 13:58:21 -06:00
Nicole Thomas
c03e8757e3 Merge pull request #32107 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-24 11:14:39 -06:00
Mircea Ulinic
7443c0ef0a Tiny doc fix 2016-03-24 11:14:01 +00:00
rallytime
a333210a08 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/rabbitmq.py
  - salt/states/rabbitmq_user.py
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 16:10:31 -06:00
Nicole Thomas
848ce5647f Merge pull request #32096 from rallytime/bp-32065 
Back-port #32065 to 2015.5
 2016-03-23 16:01:36 -06:00
Nicole Thomas
d5bb8f6372 Merge pull request #32098 from rallytime/bp-32083 
Back-port #32083 to 2015.8
 2016-03-23 15:49:01 -06:00
jacobhammons
9b332d48b9 Merge pull request #32104 from jacobhammons/dot10 
One additional known issue for 2015.5.10 release notes
 2016-03-23 15:20:49 -06:00
Jacob Hammons
b9fc882a1e One additional known issue for 2015.5.10 release notes 2016-03-23 15:19:36 -06:00
jacobhammons
518167b41b Merge pull request #32101 from jacobhammons/releases 
Release docs for 2015.8.8 and 2015.5.10
 2016-03-23 14:09:13 -06:00
Jacob Hammons
487edb1924 Release docs for 2015.8.8 and 2015.5.10 2016-03-23 14:08:36 -06:00
jacobhammons
ff51d548e1 Merge pull request #32100 from jacobhammons/dot10 
2015.5.10 release docs
 2016-03-23 14:05:21 -06:00
Jacob Hammons
544a1661ce 2015.5.10 release docs 2016-03-23 14:04:29 -06:00
Jacob Hammons
8ec5d989ad 2015.8.8 release docs 2016-03-23 14:00:30 -06:00
Thomas Güttler
4a3a6629ce "Fire Event Notifications" moved down 
it is less important. "Requisites" is what the page is about.
 2016-03-23 13:57:45 -06:00
TheNullByte
36a9d6a374 Fix an issue with the minion targeting example 
There wasn't the grain selector during the targeting, so the example actually never targets any minions.
 2016-03-23 13:56:17 -06:00
Nicole Thomas
f3872c3da3 Merge pull request #32090 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-23 13:51:57 -06:00
Mike Place
7da969aa29 Merge pull request #32060 from guettli/patch-1 
removed "all": pillar is about "particular minion"
 2016-03-23 11:19:44 -06:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-03-23 11:04:42 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 10:56:25 -06:00
C. R. Oldham
0fd625785c Merge pull request #32055 from mirceaulinic/CF-NTP-STATE 
netntp state: manage NTP peers on network devices
 2016-03-23 10:45:13 -06:00
Thomas Güttler
9bd14c1d3d "Fire Event Notifications" moved down 
it is less important. "Requisites" is what the page is about.
 2016-03-23 17:15:29 +01:00
Nicole Thomas
fc1ba937aa Merge pull request #32065 from TheNullByte/patch-1 
Fix an issue with the minion targeting example in docs
 2016-03-23 09:51:27 -06:00
C. R. Oldham
6a9ec9ce49 Merge pull request #32043 from mirceaulinic/CF-NAPALM-NTP 
New module: NAPALM_NTP, using NAPALM proxy

Merging, test failures are unrelated.

@mirceaulinic Thank you for your contribution.
 2016-03-23 08:54:08 -06:00
Nicole Thomas
c610890041 Merge pull request #32073 from nmadhok/patch-3 
Update vmware.rst
 2016-03-23 08:43:55 -06:00
Nitin Madhok
c5f26fbebb Update vmware.rst 2016-03-22 22:22:31 -04:00
Nitin Madhok
8e319ea52d Update salt.cloud.clouds.vmware.rst 2016-03-22 22:11:15 -04:00
TheNullByte
0b441da399 Fix an issue with the minion targeting example 
There wasn't the grain selector during the targeting, so the example actually never targets any minions.
 2016-03-22 16:47:42 -04:00
Thomas Güttler
4aec2c502d removed "all": pillar is about "particular minion" 2016-03-22 21:16:34 +01:00
Mircea Ulinic
37eee04706 Some doc 2016-03-22 17:47:00 +00:00
Erik Johnson
74ee8c54bc Clarify prior role of state.highstate in states tutorial 2016-03-22 10:58:45 -05:00
Mircea Ulinic
7147c6a42a napalm_ntp salt module 2016-03-22 11:40:12 +00:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
anthony-shaw
c0aa856946 Document what is in the Dimension Data Cloud support in SaltStack 2016.3 2016-03-22 11:14:26 +11:00
Josh Fraser
26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-21 09:08:21 -06:00
Josh Fraser
718d6bde11 There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-20 21:55:29 -07:00
Mike Place
63133ebbb5 Add docs for master_tries 
Refs #31794
 2016-03-20 10:27:16 -06:00
Nicole Thomas
f267b7b6ac Merge pull request #31998 from jacobhammons/mock-imports 
Fixed build errors, additional mock imports, new module docs
 2016-03-19 09:48:06 -06:00
Jacob Hammons
31bb573abc Fixes a doc build exception caused by missing mocks for modules.win_dacl 2016-03-18 17:43:36 -06:00
Jacob Hammons
e48b84c98f Fixed build errors, additional mock imports, new module docs 
Fixes #31975
 2016-03-18 17:37:22 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
 2016-03-18 16:00:35 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06:00
Bruno P. Kinoshita
fa921e6e8b Fix typo in pillar docs 
Trivial typo, s/pacakges/packages/g
 2016-03-18 10:29:34 +13:00
Justin Findlay
b984659678 update 2015.8.8 release notes 2016-03-17 15:07:10 -06:00
Bruno P. Kinoshita
31a55a786e Typo 
Trivial typo. s/Nodgroups/Nodegroups/g
 2016-03-17 17:51:58 +13:00
rallytime
06dd2c0411 Fix linking syntax in testing docs 2016-03-16 16:43:53 -06:00