valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,448 Commits 24 Branches 182 Tags 341 MiB
583e3b9a5a
Commit Graph

81448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Shaw
4b260a4594 linting 2017-05-12 16:36:07 -06:00
Anthony Shaw
41d1adab5f fix up tests 2017-05-12 16:36:06 -06:00
Anthony Shaw
b3822e03fc add fixes for incorrectly importing modules directly instead of using __salt__ 2017-05-12 16:34:49 -06:00
rallytime
542660e3f2 Bump removal version from Oxygen to Flourine for module.run 
This deprecation code was only recently put in for the `nitrogen`
release. The policy is to give at least 2 feature releases before
the deprecated code is removed. See the [Deprecating Code](https://docs.saltstack.com/en/latest/topics/development/deprecations.html)
docs for more information.

This PR bumps the warn_until/removal version from Oxygen to Fluorine
to give people more time to adjust their state modules.
 2017-05-12 15:15:14 -06:00
Erik Johnson
7fe64219ae Add rtag check to integration test for pkg.refresh_db 2017-05-12 15:21:22 -05:00
Erik Johnson
88a08aa3bf Add comments to explain what removing the rtag file actually does 2017-05-12 14:50:46 -05:00
Daniel Wallace
836ee32ff6 allow for syncing salt-ssh rosters on the master 2017-05-12 13:36:46 -06:00
Mike Place
fc2953671c Use the six version of range 2017-05-12 12:14:35 -06:00
Mike Place
049712ba53 Merge pull request #41146 from terminalmage/backport-get_tree-performance-improvement 
gitfs: Backport performance fixes for getting tree objects
 2017-05-12 12:35:46 -05:00
twangboy
e9df95d2a0 Add timout in tests instead of publish 2017-05-12 11:32:04 -06:00
Mike Place
c195d075cd Merge pull request #41151 from twangboy/fix_py_install 
Fix python 2.7.13 install, fix clean script
 2017-05-12 12:31:29 -05:00
Mike Place
aed2e18010 Merge pull request #41160 from UtahDave/stalekey_path 
Create presence.p directly in cachedir
 2017-05-12 12:28:32 -05:00
Mike Place
4215a0b99d Merge pull request #41161 from The-Loeki/2016.11 
gpg renderer: fix gpg_keydir always reverting to default
 2017-05-12 12:19:06 -05:00
Mike Place
5b10fc58ba Merge pull request #41163 from onlyanegg/elasticsearch-pass_profile_to_index_exists 
Elasticsearch - pass hosts and profile to index_exists()
 2017-05-12 12:18:05 -05:00
Mike Place
d433cf850d Merge pull request #41186 from jmarinaro/fix-chocolatey-package-collision 
Fix package name collisions in chocolatey state
 2017-05-12 12:01:30 -05:00
C. R. Oldham
84ff2f1039 Lint, remove unecessary function. 2017-05-12 10:37:46 -06:00
Mike Place
bb5ef41ce0 Merge pull request #41189 from github-abcde/utils-minions-fix 
utils/minions.py: Fixed case where data is an empty dict resulting in…
 2017-05-12 11:32:24 -05:00
Mike Place
a0a2646007 Merge pull request #41194 from rallytime/md5-warning-cleanup 
Update fingerprint hash type default from md5 to sha256
 2017-05-12 11:13:18 -05:00
Mike Place
3e9769f5ac Merge pull request #41200 from rallytime/update-vault-deprecation-version 
Move vault deprecation warnings from Oxygen to Fluorine
 2017-05-12 11:10:04 -05:00
Piotr Kaźmierczak
5f952007f6 Fix: zypper handling of multiple version packages 
For kernel packages, zypper reports multiple versions as "new" during
upgrade. Thus, a salt state requesting pkg.latest of any kernel package
would fail, even though zypper runs successfully. This commit provides
a simple fix.
 2017-05-12 10:36:12 +02:00
David Boucha
1458729646 Create presence.p directly in cachedir 
salt-key  was stacktracing when finding the presence.p file
in /var/cache/salt/master/minions
 2017-05-12 00:34:12 -06:00
twangboy
ac931b5c65 Increase timeout for Windows 2017-05-11 16:37:40 -06:00
rallytime
779a8da10e Move vault deprecation warnings from Oxygen to Fluorine 
This deprecation notice was just recently added to Nitrogen. The
deprecation policy states that we should give two feature releases
in the warning.
 2017-05-11 13:51:41 -06:00
rallytime
8dfa8d1d19 Pass the fingerprint_hash_type through for gitfs sshd tests 2017-05-11 12:29:51 -06:00
jmarinaro
229f3bf9f3 apply changes to uninstalled function 
Fixes #41185
 2017-05-11 11:25:46 -06:00
Nicole Thomas
88eabbb57d Merge pull request #41179 from rallytime/fix-jinja-template-test 
Split up test asserts in jinja template unit test
 2017-05-11 10:23:16 -06:00
Nicole Thomas
191b00a370 Merge pull request #41177 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-11 10:22:21 -06:00
C. R. Oldham
6505773f18 Digicert integration 2017-05-11 09:55:26 -06:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256 
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
 2017-05-11 09:33:45 -06:00
rallytime
d4e42b8e74 Use cptc.BaseRestCherryPyTest as test class 2017-05-11 09:09:40 -06:00
rallytime
738681c20f Pylint fix 2017-05-11 09:03:10 -06:00
herbert.buurman
853dc5406c utils/minions.py: Fixed case where data is an empty dict resulting in errors. 2017-05-11 10:57:34 +02:00
jmarinaro
ffd4c7ef04 Fix package name collisions in chocolatey state 
Fixes #41185
 2017-05-10 19:44:24 -06:00
rallytime
6729587d54 Spelling fix 2017-05-10 16:59:39 -06:00
rallytime
3a5419ba3f Split up test asserts in jinja template unit test 
Due to a bug in the equality handler, this test was failing on
CentOS 6 running Python 2.7.13. This PR splits up the test assertions
into several different pieces in order to cover all the possible
use cases, but also pass on CentOS 6.
 2017-05-10 16:55:37 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
Nicole Thomas
496fa3accd Merge pull request #41156 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-10 15:29:54 -06:00
Nicole Thomas
b136b15330 Merge pull request #41104 from Ch3LL/add_jobs_test 
Add test to query results of /jobs call in api
 2017-05-10 14:11:07 -06:00
Nicole Thomas
ca18b4df93 Merge pull request #41170 from lomeroe/bp-41081 
Backport #41081 to 2016.11
 2017-05-10 13:58:52 -06:00
Nicole Thomas
d7ec37b003 Merge pull request #41173 from twangboy/fix_installer 
Add silent action to MsgBox for Path Actions
 2017-05-10 13:57:05 -06:00
Erik Johnson
77ae15e41b Merge pull request #41155 from rallytime/git-test-fixes 
Gate and skip git state integration tests when git version is older
 2017-05-10 14:53:12 -05:00
rallytime
9014033726 Use LoaderModuleMockMixin for setting up default grains/salt dunders 2017-05-10 13:49:43 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
Nicole Thomas
e7b714b6e1 Merge pull request #41171 from terminalmage/remove-git_pillar_warning 
Remove git_pillar warning from integration suite startup
 2017-05-10 11:36:54 -06:00
rallytime
23ee513397 Pylint: Add extra line above function declaration 2017-05-10 11:32:41 -06:00
twangboy
96918dcfa6 Add silent action to MsgBox for Path Actions 2017-05-10 11:22:18 -06:00
Ch3LL
dac16583b7
add test to query results of /jobs call in api 2017-05-10 12:39:17 -04:00
rallytime
c282533612 Use with patch.dict for timezone.__grains__ dictionaries 2017-05-10 10:32:24 -06:00
Erik Johnson
03b5420988 Remove git_pillar warning from integration suite startup 
This is no longer needed since the git_pillar configuration has been
removed from the suite's master config file now that git_pillar
integration tests have been added.
 2017-05-10 11:13:43 -05:00
Nicole Thomas
4b67961707 Merge pull request #21 from terminalmage/rallytime-git-test-fixes 
Make git version checks into decorators
 2017-05-10 09:53:47 -06:00