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
82,376 Commits 24 Branches 182 Tags 341 MiB
ea8351362c
Commit Graph

82376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
ea8351362c Bugfix: args gets ignored alongside named parameters 2017-07-13 10:10:45 +02:00
Bo Maryniuk
74689e3462 Add ability to use tagged functions in the same set 2017-07-13 10:10:38 +02:00
garethgreenaway
81695a9f3c Merge pull request #42234 from Ch3LL/fix_cloud_rc 
[2017.7] parse libcloud rc version correctly
 2017-07-10 11:58:55 -07:00
Ch3LL
5aedac46b7 [2017.7] parse libcloud rc version correctly 2017-07-10 12:37:22 -04:00
garethgreenaway
0580f2e2b2 Merge pull request #42208 from terminalmage/ensure-json-string 
Fix another instance where json.loads needs a string
 2017-07-07 11:14:36 -07:00
Erik Johnson
db9b51199a Fix another instance where json.loads needs a string 2017-07-07 11:04:16 -05:00
garethgreenaway
41ef5225e9 Merge pull request #42184 from terminalmage/py3-tests 
importlib: Use load_module() instead of exec_module() to initialize loaded mods
 2017-07-06 16:04:01 -07:00
garethgreenaway
47ade9e91c Merge pull request #42088 from terminalmage/update-mocking 
Update mocking in network tests
 2017-07-06 15:03:42 -07:00
Erik Johnson
e639be8b47 importlib: Use load_module() instead of exec_module() to initialize loaded mods 
Using exec_module() results in some unexpected behavior in the LazyLoader,
so more investigation will need to be done before we can use it. In the
meantime, this commit uses load_module() instead. It also gets rid of
the now-unnecessary workarounds we had recently instituted in salt-ssh
to work around issues with the __opts__ dunder.
 2017-07-06 15:02:44 -05:00
Nicole Thomas
2ae5517d36 Merge pull request #42022 from terminalmage/issue41996 
salt.modules.dockermod: ensure that json.loads is fed a string
 2017-07-06 12:27:16 -06:00
garethgreenaway
778ed74103 Merge pull request #42147 from dmurphy18/fix_gnupgv21_for_20177 
Refine support for gnupg v2.1 for 2017. 7 branch
 2017-07-06 08:41:17 -07:00
Nicole Thomas
bbbf05a16d Merge pull request #42133 from garethgreenaway/42127_schedule_always_trigger_change_fix 
2017.7.0 modules/schedule.py fix
 2017-07-05 16:01:44 -06:00
garethgreenaway
fc74332242 Merge pull request #42130 from terminalmage/issue42116-2017.7 
Fix regression in CLI pillar override for salt-call (2017.7 branch)
 2017-07-05 14:57:57 -07:00
garethgreenaway
2df5d3b6c2 Merge pull request #42134 from terminalmage/pr-42094-2017.7 
Prevent command from showing in exception when output_loglevel=quiet (2017.7 branch)
 2017-07-05 14:56:31 -07:00
garethgreenaway
723738bab2 Merge pull request #42139 from terminalmage/revert-37222 
Revert "decode pillar on minion side on receiving"
 2017-07-05 14:54:37 -07:00
David Murphy
379e3db4c3 Refine support for gnupg v2.1 to 2017.7 branch 2017-07-05 15:33:41 -06:00
Nicole Thomas
afc19048bd Merge pull request #42131 from gtmanfred/release 
Add stuff to release notes
 2017-07-05 13:33:14 -06:00
Erik Johnson
05549addaf Revert "decode pillar on minion side on receiving" 
This reverts commit 6130722df3.
 2017-07-05 14:19:30 -05:00
Erik Johnson
e764c98277 Prevent command from showing in exception when output_loglevel=quiet 
When a command is being executed using salt.utils.timed_subprocess.TimedProc,
and that command does not exist in the PATH, it will result in an
OSError/IOError being raised. We catch this and then raise a
CommandExecutionError with some information, including the command being
run. However, when output_loglevel=quiet, we don't want any details of
the command to be visible.

This commit redacts the command details in these corner cases.
 2017-07-05 12:53:28 -05:00
Gareth J. Greenaway
2f96aada7c Removing code that was previously in place to account for a situation where we backed up the value of the original seconds parameter in the event that the splay paramter was included. Recent changes made this code no long necessary, so removing it and simply deleting the "_seconds" parameter from the schedule list output. 2017-07-05 10:29:37 -07:00
Daniel Wallace
e2b3160c96 fix up PR 2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11 add note about roster_defaults 2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468 add release note about about extmod blacklist and whitelist 2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8 Update salt-master first before updating salt-minion 
Fixes #42124
 2017-07-05 10:23:07 -06:00
Erik Johnson
d15f7ded82 Add integration test for 42116 2017-07-05 11:07:38 -05:00
Erik Johnson
c312e10cf9 Fix regression when CLI pillar override is used with salt-call 2017-07-05 11:03:27 -05:00
Nicole Thomas
9197055ea5 Merge pull request #42084 from terminalmage/assert-called-once 
Fix usage of assert_called_once in Python 3 < 3.6
 2017-07-05 09:22:39 -06:00
Mike Place
965583fa55 Merge pull request #42097 from gtmanfred/timediff 
require large timediff for ipv6 warning
 2017-07-03 20:02:23 -05:00
Mike Place
97c20c20cb Import datetime 2017-07-03 16:37:31 -06:00
Mike Place
628e52d740 Merge pull request #42098 from twangboy/win_repo_docs 
Change repo_ng to repo-ng
 2017-07-03 17:12:46 -05:00
Mike Place
41514b886e Merge pull request #42096 from twangboy/win_use_default_configs 
Use default salt configs for Windows installs
 2017-07-03 17:03:26 -05:00
Daniel Wallace
d5f91fe9b0 require large timediff for ipv6 warning 2017-07-03 14:24:36 -06:00
twangboy
5a5d70866a Change repo_ng to repo-ng 2017-07-03 14:15:35 -06:00
twangboy
c1e899c0ca Create Master installer if script is found 2017-07-03 13:54:27 -06:00
Mike Place
aef6963d07 Merge pull request #42089 from gtmanfred/spm 
pass cachedir from kwargs in cache
 2017-07-03 14:41:48 -05:00
Mike Place
24a7d85b87 Merge pull request #42090 from twangboy/win_add_salt_bat 
Add missing batch file
 2017-07-03 14:40:56 -05:00
twangboy
7da86b3540 Use default salt configs for Windows installs 2017-07-03 13:33:24 -06:00
twangboy
e4183a6d1c Fix comments 2017-07-03 10:27:04 -06:00
twangboy
984b736e14 Add missing batch file 2017-07-03 10:24:10 -06:00
Daniel Wallace
1c495ced3c pass cachedir from kwargs in cache 2017-07-03 09:55:19 -06:00
Erik Johnson
fc27c1a948 Update mocking in network tests 
017fbdb changed the function calls in such a way that tests in 2017.7
now fail. This updates the mocking to account for new code paths
introduced in this commit.
 2017-07-03 10:43:34 -05:00
Erik Johnson
fdb8531724 Merge pull request #42071 from garethgreenaway/42070_state_runs_via_salt_ssh 
fix to ssh/wrapper/state.sls
 2017-07-03 09:43:57 -05:00
Erik Johnson
d942752e95 Fix usage of assert_called_once in Python 3 < 3.6 
This is a more complete fix which builds upon 41c65b0 and covers all
refs to assert_called_once in the suite.
 2017-07-03 09:30:12 -05:00
Gareth J. Greenaway
e9c8a4a225 When building up the remote file location nothing was being returned via _thin_dir so the remote path was starting with None. This change updates _thin_dir to return a value for format to use. 2017-07-01 17:44:16 -07:00
Mike Place
b95b165d0e Merge pull request #42066 from terminalmage/thin-dir-py3 
salt-ssh: get thin_dir from master_opts if not in opts
 2017-06-30 20:32:22 -05:00
Erik Johnson
7e59d68910 salt-ssh: get thin_dir from master_opts if not in opts 2017-06-30 20:29:25 -05:00
Mike Place
9eb8ea5b33 Merge pull request #42025 from terminalmage/move-mkstemp 
Move salt.utils.files.mkstemp temporarily back to salt.utils
 2017-06-30 20:14:29 -05:00
Erik Johnson
ed1e773dfc Move salt.utils.files.mkstemp temporarily back to salt.utils 
Old code from earlier branches may cause problems when merging forward,
this moves the function back to its old location and we will work on
getting it permanently renamed in develop.
 2017-06-30 18:24:50 -05:00
Mike Place
1bdb2f668b Merge pull request #42061 from terminalmage/fix-loader-subdir 
LazyLoader: fix loading module from a subdir
 2017-06-30 17:44:07 -05:00
Mike Place
5b2ae2dd04 Merge pull request #42062 from terminalmage/arch-grains-test 
Add debug logging for grains tests
 2017-06-30 16:58:15 -05:00