valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,151 Commits 24 Branches 182 Tags 341 MiB
da8f5ac0c6
Commit Graph

75151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
da8f5ac0c6 Merge pull request #38101 from lorengordon/file-replace-note 
Clarifies file.replace behavior on symlinks
 2016-12-07 06:27:11 -07:00
Mike Place
d47761f349 Merge pull request #38113 from terminalmage/issue38090 
Revert changes to refresh tag for pkg states
 2016-12-07 06:11:14 -07:00
Mike Place
d4c34e0a58 Merge pull request #38120 from Da-Juan/2016.11 
Fix status beacon config default values
 2016-12-07 06:08:33 -07:00
Mike Place
6868089a87 Merge pull request #38114 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-07 05:45:04 -07:00
Mike Place
b9920e54ee Merge pull request #38109 from gtmanfred/2016.11 
mode needs to be an integer
 2016-12-07 04:58:23 -07:00
Da-Juan
7e4a35e8ad Fix status beacon config default values 
Config values are expected as lists not strings.
This fixes saltstack/salt#37976
 2016-12-07 12:55:35 +01:00
rallytime
fec9dec23a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/daemons_test.py
  - tests/unit/states/file_test.py
 2016-12-06 16:23:51 -07:00
Nicole Thomas
fd77dcbd0f Merge pull request #38103 from rallytime/bp-37283 
Back-port #37283 to 2016.11
 2016-12-06 16:12:59 -07:00
Nicole Thomas
5d9d6b9280 Merge pull request #38057 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-06 16:11:41 -07:00
Nicole Thomas
9969544653 Account for case where vim install already exists and is at an older version (#38112) 2016-12-06 16:07:56 -07:00
Erik Johnson
9f347df012 Revert changes to refresh tag for pkg states 
This reverts commit cd16f7f9bb.
 2016-12-06 16:28:38 -06:00
rallytime
342884018b Fix SaltKeyOptionParserTestCase test failures 2016-12-06 15:03:44 -07:00
Daniel Wallace
7546760eb3 mode needs to be an integer 
It can't be 'Disabled'.  That cannot be written to
/sys/fs/selinux/enforce
 2016-12-06 14:47:41 -06:00
Jean Praloran
11944df69b handle up to version 1.9.0 2016-12-06 09:53:39 -07:00
rallytime
186e2d0d03 Don't allow libcloud mock module injection in unit/states/libcloud_dns_test.py either 2016-12-06 09:24:07 -07:00
Loren Gordon
345990f2b0 Clarifies file.replace behavior on symlinks 2016-12-06 10:58:09 -05:00
Mike Place
f8c67a9598 Merge pull request #38021 from mateiw/salt-ssh_master_tops 
Add master_tops support in salt-ssh
 2016-12-06 07:26:22 -07:00
Mike Place
fbc87769b9 Merge pull request #38083 from twangboy/fix_refresh_db 
Only delete .sls files from winrepo-ng [DO NOT MERGE FORWARD]
 2016-12-06 07:13:35 -07:00
rallytime
d513a60189 Do not allow libcloud to be injected as a mock value in the libcloud_dns_test 
Other tests rely on importing libcloud, which should
not be a mock value.
 2016-12-05 16:55:18 -07:00
Nicole Thomas
1bb31bbebd Start release notes file for 2016.11.1 release (#38084) 2016-12-05 15:24:11 -07:00
Mike Place
78295516e7 Merge pull request #37878 from kstreee/2016.11 
Makes threads avoid blocking waiting while communicating using Zeromq.
 2016-12-05 12:50:46 -07:00
Mike Place
0809ccd429 Merge pull request #37987 from rbjorklin/consul-pillar-target 
consul_pillar support for limiting pillar exposure via minion targeting
 2016-12-05 12:48:20 -07:00
twangboy
978af6d83c Remove only .sls files from the cached winrepo-ng 2016-12-05 12:24:16 -07:00
Mike Place
83dcfe81ea Merge pull request #38067 from terminalmage/issue38062 
Remove virtual funcs for archive state/module
 2016-12-05 09:37:23 -07:00
Robin Björklin
5d0454a7ca Ignore W1401 (anomalous-backslash-in-string) 2016-12-05 13:41:47 +01:00
Robin Björklin
2e929a5ecc Linting fixes 2016-12-05 11:13:45 +01:00
Erik Johnson
2e0f26a084 Remove virtual funcs for archive state/module 
Since not all funcs require the CLI commands, the better way of handling
this is to check for presence of the needed funcs and gracefully exit a
state when the function is not present.
 2016-12-04 23:31:51 -06:00
Mike Place
c9933670f9 Merge pull request #38058 from rallytime/remove-init-db-dep 
Remove initdb dependency in postgres module
 2016-12-03 21:19:01 -07:00
Mike Place
9dcfdeef6b Merge pull request #38059 from rallytime/daemons-test-fix 
Call exec_test for the Syndic daemon in tests.unit.daemons_test.py
 2016-12-03 21:18:41 -07:00
rallytime
eb372b27d8 Add missing "not" statement: The last syndic test should assertFalse() 2016-12-02 16:53:39 -07:00
rallytime
74a417e527 Update the mocked cloud configs to also include master configs 
The master configs are injected into the cloud configs, and we need
them here in order to get the `user` default for the parsers test.
 2016-12-02 15:38:53 -07:00
rallytime
f2c8cb13d0 Better merge conflict resolution from the initial merge 2016-12-02 15:37:53 -07:00
rallytime
4e10f8e018 Call exec_test for the Syndic daemon in tests.unit.daemons_test.py 2016-12-02 13:08:41 -07:00
Mike Place
9cd42b9b3f Merge pull request #38039 from rallytime/fix-37939 
Check to see if a line is already commented before moving on
 2016-12-02 13:08:35 -07:00
Mike Place
a34a763984 Merge pull request #38045 from terminalmage/issue38037 
yumpkg.py: don't include non-upgrade versions found by "yum list available"
 2016-12-02 13:07:38 -07:00
rallytime
c1ceeca3d3 Remove initdb dependency in postgres module 
The initdb dep was removed in #37993 to fix #37935, but was
subsequently (likely accidentally) added back to the module
in PR #38023.
 2016-12-02 13:03:20 -07:00
rallytime
8fd53a4808 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
  - tests/unit/daemons_test.py
 2016-12-02 12:18:18 -07:00
Mike Place
1ac53e5196 Merge pull request #38004 from terminalmage/issue37969 
Fix regression in user/group mgmt for archive.extracted
 2016-12-02 11:28:48 -07:00
Mike Place
65a0f102fd Add/remove newlines 
Needed for the lint check to pass.
 2016-12-02 11:27:06 -07:00
rallytime
1da7aacfbe Update unit tests to account for additional file.search call 
Also removed some mocks that were not needed anymore for the
calls to ``file.contains_regex_multiline`` because that function
is no longer called in the state file.
 2016-12-02 11:22:10 -07:00
Erik Johnson
65289503d9 Simplify logic for matching desired pkg arch with actual pkg arch 2016-12-02 12:14:13 -06:00
Erik Johnson
3babbcda94 yumpkg.py: don't include non-upgrade versions found by "yum list available" 2016-12-02 12:14:13 -06:00
Mike Place
e90cbbef08 Merge pull request #38051 from Ch3LL/fix_hash_docs 
add docs for hash_type change to sha256
 2016-12-02 11:11:36 -07:00
Ch3LL
e95f88fbe3 add docs for hash_type change to sha256 2016-12-02 09:28:50 -07:00
Mike Place
1b52289508 Merge pull request #38028 from terminalmage/issue38000 
Pass full_return to saltutil.runner
 2016-12-02 02:49:31 -07:00
kstreee
9103878c4f Fixes blocking waiting through implementing a socket pool class. 2016-12-02 18:47:33 +09:00
Robin Björklin
171cab1726 Fixed possible incorrect behavior if target wasn't on start/end of str 2016-12-02 10:47:26 +01:00
Mike Place
41c44ff684 Merge pull request #38044 from terminalmage/issue37980 
Remove debugging code
 2016-12-02 02:43:44 -07:00
Erik Johnson
f70a0409b3 Remove debugging code 
This was left in to debug per-saltenv config overlays. I thought I had
removed it weeks ago, but I guess I didn't, and it made it into
2016.11.0. This commit removes the debugging code.
 2016-12-01 23:20:01 -06:00
rallytime
8a685b1820 Check to see if a line is already commented before moving on 
Fixes #37939
 2016-12-01 16:52:56 -07:00