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
72,652 Commits 24 Branches 182 Tags 341 MiB
49179ac401
Commit Graph

72652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Peter V. Saveliev
3fa9c10136 beacons: fix pyroute2 import statement 
Use public "root" imports -- `from pyroute2 import ...`

The public API is guaranteed to stay the same despite any
internal layout changes.

Bug-Url: https://github.com/saltstack/salt/issues/34978
 2016-08-09 12:29:21 +02:00
Mike Place
fe7c399b54 Merge pull request #35294 from m03/add-win_iis-unit-tests1 
Add initial win_iis unit tests
 2016-08-09 18:52:13 +09: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
Mike Place
64a84e04da Merge pull request #35287 from derekmaciel/2016.3 
2016.3
 2016-08-09 18:49:37 +09:00
Morrie Winnett
04acb5657b Add initial win_iis unit tests 2016-08-09 01:25:43 -07:00
Hengyang Hu
86fb359f58 fix 34425, a bug that sys.doc cannot output format 2016-08-08 21:12:13 -07:00
Brian Glogower
6f72f02f4d Fixes #30577 - Add log_config option 
This is a hack to get log_config working with dockerng. Currently, there is
no way to clear/override the daemon's log options. This makes _compare() not
happy, after it checks if the changes were applied correctly. _compare() will
continue to see a diff, since the container is inheriting the daemon's log
options.

The other known problem is that there is no remote API for querying the daemon's
log options. This makes detecting if there are changes difficult. If the user
specifies nothing in the state file, how will salt know if there is a diff, since
it doesn't know what the default log options should be, since they are configured
at daemon startup. This change will take no action if the state file doesn't not
reference log_config. If the operator wants to have the container use the same
log options as the daemon, they will either have to set them in the state file,
or remove the container and have salt redeploy it.

Additional reading: https://github.com/saltstack/salt/issues/30577#issuecomment-238322721
 2016-08-08 19:13:40 -07:00
rallytime
14454eab72 Add cloud deprecations to release notes 
And give cloud deprecations their own section to make things
easy to spot.
 2016-08-08 19:47:56 -06:00
rallytime
af19fc271d Remove the create_dns_record and delete_dns_record functions 
These are deprecated in Salt Carbon. Use post_dns_record instead.
 2016-08-08 19:25:18 -06:00
rallytime
8f2058219e Remove private_ip option in linode driver 
This option has been deprecated - use assign_private_ip instead.
 2016-08-08 19:25:18 -06:00
Mike Place
7310921f81 Merge pull request #35277 from plastikos/bug-testprogram_env_pythpath 
Joining sys.path is redundant and causes the string result to be split and re-joined.
 2016-08-09 09:10:11 +09:00
Mike Place
83ed736e6f Merge pull request #35280 from alxf/ini_manage 
Fix proposal for the module ini_manage
 2016-08-09 09:08:44 +09:00
Mike Place
a2955822a7 Merge pull request #35281 from mollykreis/dev/mkreis/computer_desc_fix 
Dev/mkreis/computer desc fix
 2016-08-09 09:05:27 +09: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
Mike Place
715dc14b9b Merge pull request #35247 from rallytime/carbon-deprecations 
Remove some of the things that are deprecated in Carbon
 2016-08-09 09:00:27 +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
alxf
4f233202f4 Fix module ini_manage 
- handle IOError exception, and return error.
    - don't return error when an ini file is found but is empty.
 2016-08-08 22:17:01 +02:00
Nicole Thomas
6e37762ac1 Merge pull request #35279 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-08 13:56:23 -06:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -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
Thayne Harbaugh
5fb3f025e4 Joining sys.path is redundant and causes the string result to be split and re-joined. 2016-08-08 11:31:17 -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
Mike Place
5509df911f Merge pull request #35270 from jf/exact_matching_for_sys.list_x_functions 
Exact matching for sys.list_x_functions
 2016-08-09 01:43:08 +09:00
Mike Place
e4603192d8 Merge pull request #35273 from rallytime/lint-develop 
Lint and doc fixes for mount state on develop
 2016-08-09 01:39:35 +09:00
Mike Place
5ffbd852c6 Merge pull request #35184 from rallytime/py3-unit-state-service-test 
PY3: Don't use contextlib.nested - it is deprecated.
 2016-08-09 01:39:10 +09:00
Daniel Wallace
9b9fc508cc add identity v3 support to openstack driver 
closes #27294
 2016-08-08 10:13:39 -06:00
rallytime
4835c31f23 Remove tests for deprecated functions 2016-08-08 09:58:37 -06:00
Mike Place
843b21e356 Merge pull request #35208 from thatch45/winfix_wheel 
Fix wheel module bug
 2016-08-09 00:55:14 +09:00
rallytime
86a5e04417 Pylint fix 2016-08-08 09:53:29 -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
rallytime
7b6f25ed21 Lint and doc fixes for mount state on develop 2016-08-08 09:33:25 -06:00
Jeffrey 'jf' Lim
474ce496eb Fix linting problem ('at least two spaces before inline comment') 2016-08-08 23:28:52 +08:00
Mike Place
4759522a15 Merge pull request #35261 from tsaridas/boto_iam_extras 
Boto iam extras
 2016-08-09 00:24:16 +09:00
Mike Place
19f228e309 Merge pull request #35263 from tsaridas/boto_rds 
update parapeter group for replicas
 2016-08-09 00:10:33 +09:00
Mike Place
00d2d57caa Merge pull request #35265 from m03/win_iis-state-examples1 
Add yaml examples for win_iis state
 2016-08-08 23:57:27 +09: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
Mike Place
914d309230 Merge pull request #35266 from garrettheel/github-repos 
Allow management of Github repos
 2016-08-08 23:20:49 +09:00
Ivan Babrou
6cdee21036
Default state_output_profile to True everywhere, closes #35166 2016-08-08 13:38:39 +01:00
Jeffrey 'jf' Lim
2a45954205 Standardize on s/module/moduledot variable naming 2016-08-08 20:24:52 +08:00
Jeffrey 'jf' Lim
ad1ce91d20 Fix sys.list_returner_functions glob matching (#35255), and also allow it to 
do exact matching for function names
 2016-08-08 20:16:08 +08: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