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
68,827 Commits 24 Branches 182 Tags 341 MiB
3c628d3cbc
Commit Graph

68827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
3c628d3cbc Merge pull request #35362 from rallytime/correct-deprecated-tag 
Correct deprecation version tags
 2016-08-11 09:34:38 +09:00
rallytime
507827a014 Correct deprecation version tags 
Deprecation tags should denote when the function was placed on a
deprecation path, not when it will be removed. This PR fixes the
version information as well as changes the warning messaging to
function-specific wording rather than the module getting removed.
(The module won't fully be removed until Oxygen.)

See #35361 for more information.
 2016-08-10 15:00:07 -06:00
Nicole Thomas
87e29188c0 Merge pull request #35347 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-10 14:07:42 -06:00
rallytime
a651962e95 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-10 10:02:03 -06:00
Mike Place
3487d761a2 Restore random_master functionality (#35334) 
Was errantly removed in 80b1d60f4c
 2016-08-10 09:37:08 -06:00
Mike Place
78dfd18ec6 Merge pull request #35331 from hu-dabao/fix-35165 
fix 35165, salt-run jobs.exit_success jid is broken
 2016-08-10 20:50:10 +09:00
Mike Place
fcca0b9333 Merge pull request #35318 from rallytime/remove-deprecation-docs 
Remove legacy compat docs in mysql pillar since the code was removed already
 2016-08-10 20:34:48 +09:00
Mike Place
4618b433e9 Merge pull request #35323 from thatch45/ssh_crazy 
Fix issue with bad error check in salt-vt
 2016-08-10 20:33:49 +09:00
Mike Place
cfae862972 Merge pull request #35325 from kev009/fbsd-netstat-route 
Fix freebsd netstat route on fbsd 10+
 2016-08-10 20:33:12 +09:00
Mike Place
3446dc9ec6 Merge pull request #35329 from hu-dabao/fix-tiny-salt-cli 
sys.doc will skip all not connected minions
 2016-08-10 20:18:22 +09:00
Hengyang Hu
4dcce18d01 fix 35165, salt-run jobs.exit_success jid is broken 2016-08-09 22:36:21 -07:00
Hengyang Hu
4b806a70ea sys.doc will skip all not connected minions 2016-08-09 21:00:05 -07:00
Kevin Bowling
0d49dd3c29 Fix fbsd netstat route on fbsd 10+ 2016-08-09 18:41:34 -07:00
Thomas S Hatch
8a5b47b5d7 Collect all error data from the wfuncs call 2016-08-09 17:39:14 -06:00
Thomas S Hatch
11864c31b7 supress a stack trace to show clean ssh error 2016-08-09 17:24:56 -06:00
Thomas S Hatch
9fbfa282fa wow this solves an issue! 2016-08-09 17:05:22 -06:00
rallytime
75f205e485 Remove legacy compat docs in mysql pillar since the code was removed already 
Refs #30913
 2016-08-09 15:27:11 -06:00
Ivan Babrou
244c3bd495 Pass port to ssh.check_known_host, closes #35264 (#35301) 2016-08-09 13:16:01 -06:00
Erik Johnson
243909f39d file.recurse: Do not convert octal mode string to int (#35309) 
* Add integration test for #34945

* file.recurse: Do not convert octal mode string to int

When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.

Fixes #34945.
 2016-08-09 13:02:26 -06:00
Nicole Thomas
31f7d307a7 Merge pull request #35306 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-09 12:50:44 -06:00
rallytime
2d3eadfe49 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-09 11:15:48 -06:00
Mike Place
94529d0578 Merge pull request #35229 from lubyou/fix-mac_shadow 
Ignore import error for pwd module in mac_shadow
 2016-08-10 00:48:16 +09:00
Mike Place
ce7aeb6ca4 Merge pull request #35227 from isbm/isbm-osfinger-ubuntu-fix 
Isbm osfinger ubuntu fix
 2016-08-10 00:38:30 +09:00
Mike Place
2efc1b333b Merge pull request #35290 from terminalmage/issue35051 
Resolve a couple bugs in orchestration output
 2016-08-10 00:27:00 +09:00
Erik Johnson
d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict 2016-08-09 08:49:52 -05:00
Erik Johnson
90c12a9c7b Add __orchestration__ key to orch returns for runner/wheel funcs 
This gets passed through to the highstate outputter to suppress the
error in the output when the changes param is not a dict.
 2016-08-09 08:49:52 -05:00
Erik Johnson
7b8c3b86e7 Suppress error about invalid changes data for orchestration jobs 2016-08-09 08:49:52 -05:00
Erik Johnson
54a1704d6c Suppress event for wheel/runner funcs executed from orchestration 2016-08-09 08:49:52 -05:00
Erik Johnson
f409f62bf2 Accept print_event option in WheelClient.cmd() 2016-08-09 08:49:52 -05:00
Erik Johnson
b42b25ccce Add cmd func for RunnerClient 2016-08-09 08:49:52 -05:00
Erik Johnson
480065fe00 Add print_event option to client mixins 
This allows the printing of namespaced events to be suppressed, for
instance in cases where we are running orchestration and don't want the
return data from a runner/wheel function to be printed to the console.
 2016-08-09 08:49:52 -05:00
Mike Place
47e328f755 Merge pull request #35286 from hu-dabao/fix-34425 
fix 34425, a bug that sys.doc cannot output format
 2016-08-09 18:50:12 +09:00
Hengyang Hu
86fb359f58 fix 34425, a bug that sys.doc cannot output format 2016-08-08 21:12:13 -07:00
Mike Place
d79cb1b4ec Merge pull request #35275 from rallytime/bp-35213 
Back-port #35213 to 2016.3
 2016-08-09 09:02:43 +09:00
David Murphy
72502f5990 Increase timeout for siging to 10 seconds when signing rpm packages (#35278) 2016-08-08 16:50:05 -06:00
Nicole Thomas
959a00e4b7 Merge pull request #35276 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-08 12:20:29 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
 2016-08-08 11:15:43 -06:00
Mike Place
157939d5b0 Merge pull request #35274 from rallytime/lint-2016.3 
Lint fixes for 2016.3 branch
 2016-08-09 01:45:41 +09:00
Daniel Wallace
9b9fc508cc add identity v3 support to openstack driver 
closes #27294
 2016-08-08 10:13:39 -06:00
rallytime
0d3d711e9c Lint fixes for 2016.3 branch 2016-08-08 09:48:21 -06:00
Thomas S Hatch
f8158124d5 Merge pull request #35211 from cachedout/issue_31074 
Alternative sudo users for salt-ssh
 2016-08-08 09:40:55 -06:00
Mike Place
c58bb18624 Merge pull request #35269 from meaksh/checksum-during-zypper-pkg-download-for-2016.3-and-develop 
Checksum validation for zypper pkg.download in 2016.3 and develop
 2016-08-08 23:45:16 +09:00
Mike Place
3e4eb13daa Merge pull request #35271 from bobrik/default-output-profile 
Default state_output_profile to True everywhere, closes #35166
 2016-08-08 23:36:23 +09:00
Ivan Babrou
6cdee21036
Default state_output_profile to True everywhere, closes #35166 2016-08-08 13:38:39 +01:00
Pablo Suárez Hernández
18700e821e unit tests for rpm.checksum() and zypper.download() 
lint issue fixed
 2016-08-08 11:57:14 +01:00
Pablo Suárez Hernández
c3f29ab205 checksum validation during zypper pkg.download 2016-08-08 11:56:50 +01:00
Mike Place
d3f2ce2a1a Merge pull request #35197 from vutny/pkgbuild-repo-failure-detection 
Make `pkgbuild.repo` state recognize `createrepo` command return code
 2016-08-07 08:20:47 +09:00
Mike Place
673e1aa1aa Merge pull request #35233 from terminalmage/issue32719 
Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty
 2016-08-07 07:58:32 +09:00
Mike Place
f004b831d2 Merge pull request #35178 from cro/proxy_cache_fix2 
Add append_minionid_config_dirs option
 2016-08-07 07:21:14 +09:00
Mike Place
6eb1c48469 Merge pull request #35259 from cachedout/fixup_35253 
Fixup 35253
 2016-08-07 06:59:48 +09:00