valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,338 Commits 24 Branches 182 Tags 341 MiB
a09aa18036
Commit Graph

61338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
a09aa18036 Merge pull request #32127 from rallytime/dunder-docs 
Add runners to __salt__ docs
 2016-03-25 09:54:02 -06:00
Nicole Thomas
cc224b877a Merge pull request #32143 from DSRCompany/issues/30183_failover_fix 
Set auth retry count to 0 if multimaster mode is failover.
 2016-03-25 09:23:09 -06:00
Nicole Thomas
0679a61871 Merge pull request #32134 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-25 09:22:07 -06:00
Erik Johnson
ad924226ca Merge pull request #32091 from clarkperkins/bugfix/yumpkg-repoquery 
Fixed the regression in #410da78
 2016-03-25 09:53:08 -05:00
Dmitry Kuzmenko
93d34a2573 Set auth retry count to 0 if multimaster mode is failover. 
Backport of PR #31382 into 2015.8.
 2016-03-25 16:58:44 +03:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -06:00
Nicole Thomas
b84908d51f Merge pull request #32135 from rallytime/32129-to-2915.8 
[2015.8] Support multiple valid option types when performing type checks
 2016-03-24 16:42:28 -06:00
rallytime
482690ef33 Add note to docs about __salt__ referencing runner modules 2016-03-24 16:35:50 -06:00
Mike Place
b23a08f3f4 Merge pull request #31760 from sakateka/fix_master_switch 
SMinion need wait future from eval_master
 2016-03-24 16:08:56 -06:00
Erik Johnson
7d43bdd721 Change type check errors to debug loglevel 2016-03-24 16:01:14 -06:00
Erik Johnson
ed5abf4381 Support multiple valid option types when performing type checks 
Fixes #32044.
 2016-03-24 16:01:06 -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
Mike Place
5efe37ddc8 Merge pull request #32106 from jfindlay/suse_patch 
update suse master service patch
 2016-03-24 15:34:01 -06:00
Mike Place
bdd7ea89d5 Merge pull request #32129 from terminalmage/issue32044 
Support multiple valid option types when performing type checks
 2016-03-24 15:16:29 -06:00
Erik Johnson
34ca1ea12e Change type check errors to debug loglevel 2016-03-24 15:30:58 -05:00
Erik Johnson
5462081488 Support multiple valid option types when performing type checks 
Fixes #32044.
 2016-03-24 15:30:58 -05:00
jacobhammons
939c1b17d5 Merge pull request #32130 from jacobhammons/dot8 
Added known issues 32004 and 32044 to 2015.8.8 release notes
 2016-03-24 13:59:41 -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
rallytime
a11d2e413a Add runners to __salt__ docs 2016-03-24 12:25:45 -06:00
Nicole Thomas
2d8abf4717 Merge pull request #32105 from clarkperkins/bugfix/invalid-deploy-script-path 
Fixed invalid deploy_scripts_search_path
 2016-03-24 11:36:27 -06:00
Nicole Thomas
c42014eb54 Merge pull request #32056 from bstevenson/fix-list_absent 
Fix list absent
 2016-03-24 11:35:00 -06:00
Nicole Thomas
fe4112d7f9 Merge pull request #32117 from rodacom/fix_32114 
Fixed validation type for file_ignore_glob
 2016-03-24 11:28:22 -06:00
Nicole Thomas
93d86d249c Merge pull request #32113 from sakateka/correct_log_message 
Fix log message for AsyncAuth initialization
 2016-03-24 11:27:04 -06:00
Nicole Thomas
294177f428 Merge pull request #32116 from ticosax/memory_swap-default-from-container 
Obtain default value of `memory_swap` from the container.
 2016-03-24 09:56:54 -06:00
Tom LAREDO
c6f83ba00b Fixed validation type for file_ignore_glob 
Fixes #32114
 2016-03-24 15:33:34 +01:00
Nicolas Delaby
fe439db4d3 Obtain default value of memory_swap from the container. 2016-03-24 10:15:05 +01:00
Sergey Kacheev
71148d77ab Fix log message for AsyncAuth initialization 2016-03-24 13:24:40 +06:00
Sergey Kacheev
3d7874029a Run self.eval_master in self.io_loop.run_sync 2016-03-24 13:11:43 +06:00
Justin Findlay
8de84b4251 update suse master service patch 
Fixes #780.
 2016-03-23 16:03:12 -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
Clark Perkins
5a9f4e947e Fixed invalid deploy_scripts_search_path 2016-03-23 16:29:53 -05: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
Brian Stevenson
1500aae027 set deleted value to list 2016-03-23 13:47:12 -07: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
jacobhammons
e45107ce96 Merge pull request #32099 from jacobhammons/dot8 
2015.8.8 release docs
 2016-03-23 14:02:40 -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
Clark Perkins
d2119ea608 Added comment so this issue doesn't regress again 2016-03-23 14:05:21 -05:00
Mike Place
9e11f3aac5 Merge pull request #32088 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-23 11:52:37 -06:00
Brian Stevenson
1dc8f5f289 unit test update 
grain value looks for list in assertion
 2016-03-23 10:50:32 -07:00
Clark Perkins
1455fab9e3 Fixed the regression in #410da78 2016-03-23 12:46:14 -05:00
Mike Place
72a20f9799 Merge pull request #32038 from terminalmage/issue32037 
Improve state module docs, replace references to state.highstate/state.sls with state.apply
 2016-03-23 11:08:02 -06:00
rallytime
59c3b7e82e Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/state.py
 2016-03-23 10:53:20 -06:00
Mike Place
908a7bf5cd Merge pull request #32051 from terminalmage/fix-state-apply-output 
Fix outputter for state.apply
 2016-03-23 10:42:43 -06:00
Mike Place
bc9a899bc8 Merge pull request #32074 from Xiami2012/fix_iptables 
Fix code for proto args in modules.iptables
 2016-03-23 10:37:58 -06:00
Xiami
aae3af7e49 Fix code for proto args in modules.iptables 
In modules.iptables.build_rule:
  Fix incorrect output when providing proto='!tcp'
  Make salt cleverer when both 'protocol' and 'proto' in kwargs.

NOTE: Conflicts in merge commit 000de95 are wrong dealed with.
 2016-03-23 18:19:18 +08:00