valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,608 Commits 24 Branches 182 Tags 341 MiB
57d8bd36ee
Commit Graph

73608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
57d8bd36ee Pylint fix 2016-09-13 13:27:46 -06:00
rallytime
faa27a82fa Pass the key kwarg through to the flush function 2016-09-13 11:08:43 -06:00
rallytime
1e9806950d Clean up imports in salt/cache/__init__.py 
the 'os' import is not used, and splitting them out into python vs. salt
imports makes them easier to read and more consistent with other salt files
 2016-09-13 11:03:47 -06:00
rallytime
387ed8bb9f Add unit tests for salt.cache.localfs.py 2016-09-13 10:52:15 -06:00
Shane Lee
d9bbba9b24 Add missing documentation for the mac_package module (#36192) 
* Add missing documentation for the mac_package module

* Standardize ID in docstrings
 2016-09-12 11:57:41 -06:00
Shane Lee
019ef1c47c Remove invalid JSON for Mac OS X (#36167) 
* Remove invalid JSON for Mac OS X

* Check for fsevents line and remove
 2016-09-12 11:42:43 -06:00
Nicole Thomas
9ce4abefcd Merge pull request #36234 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-12 11:40:30 -06:00
rallytime
c3dcbb5906 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
  - salt/utils/process.py
 2016-09-12 09:47:33 -06:00
Hengyang Hu
3c694a371b make a centralized master_event func, replace the hardcoded ones across the codebase (#36221) 2016-09-12 09:22:20 -06:00
Mike Place
1b12940a1f Docs clarification for module sync and state.apply (#36217) 
Closes #35340
 2016-09-12 08:42:12 -06:00
Erik Johnson
b83c0b9238 salt.utils.gitfs: Fix ref to self.root (#36215) 
This regressed during a recent merge-forward. See here for more info:

https://github.com/saltstack/salt/commit/2b1ad9e#diff-2c34a66e40db8ce28e251f98de56ce31L406

Resolves #36095.
 2016-09-12 08:39:22 -06:00
Mike Place
5a7a72346a Merge pull request #36202 from hu-dabao/add-36049 
for 36049, log current connected master and make status module more useful and efficient
 2016-09-12 08:18:24 +09:00
Mike Place
5ddf0af23e Merge pull request #36166 from jfindlay/parallels 
modules.parallels.delete: allow multiple IDs for same name
 2016-09-12 08:00:56 +09:00
Mike Place
6ebe655e17 Merge pull request #36184 from DSRCorporation/bugs/35480_master_shutdown 
Disable signal handling while handling signal
 2016-09-12 07:59:08 +09:00
Mike Place
1eb67df61e Merge pull request #36198 from gtmanfred/carbon 
add keystone state integration tests
 2016-09-11 18:16:38 +09:00
Mike Place
f11f093f8c Merge pull request #36203 from xiaoanyunfei/logowner 
fix owner of MultiprocessingLoggingQueue
 2016-09-11 18:15:15 +09:00
xiaoanyunfei
74dc90c7bb cancle pr last 2016-09-10 10:04:22 +08:00
xiaoanyunfei
90e4a25dd0 Merge branch 'logowner' of https://github.com/xiaoanyunfei/salt into logowner 2016-09-10 10:02:00 +08:00
xiaoanyunfei
ffd87b2f2f fix logqueue owner 2016-09-10 09:57:29 +08:00
xiaofei.sun
bd61b88fc8 fix log owner 2016-09-10 09:37:53 +08:00
xiaofei.sun
58160ed6c0 Merge branch '2016.3' of github.com:saltstack/salt into 2016.3 2016-09-10 09:06:21 +08:00
Hengyang Hu
5f339356cf for 36049, log current connected master and make status module more useful and efficient 2016-09-09 17:22:50 -07:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone 
skip some mac_timezone tests
 2016-09-10 09:07:07 +09:00
Mike Place
b504d07006 Merge pull request #36196 from twangboy/mac_brew_tests 
Fix test_latest_version test
 2016-09-10 09:03:57 +09:00
Daniel Wallace
1c31d5e464 add keystone state integration tests 
fix api_version for using connection_args
 2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Thomas S Hatch
b586ed75bd if the backend stack traces when it should return an empty string (#36193) 2016-09-09 13:14:36 -06:00
Nicole Thomas
f035121291 Merge pull request #36188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-09 12:59:20 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945) 
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
 2016-09-09 12:58:50 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
Nicole Thomas
846f940fd2 Merge pull request #36186 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-09 11:29:19 -06:00
rallytime
521a7b2470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/opennebula.py
 2016-09-09 09:53:02 -06:00
rallytime
3ed6190ece Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
 2016-09-09 09:36:57 -06:00
t2b
d4628f3c6b Allow additional kwargs in states.dockerng.image_present (#36156) 
Fixes #31513
 2016-09-09 09:32:38 -06:00
Dmitry Kuzmenko
229504efef Removed unused import. 2016-09-09 15:29:03 +03:00
Dmitry Kuzmenko
ca8eb7e076 Don't run the same signal handler twice. Catch os.kill errors. 
Else a Process Not Found error stops the killing loop and there are
still alive master subprocesses.
 2016-09-09 15:27:20 +03:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819 
Catch CommandExecutionError when the group in group_installed doesn't exist
 2016-09-09 19:14:16 +09:00
Mike Place
e1bb2663ba Merge pull request #35985 from DSRCorporation/bugs/35945_salt-key_print_errors_to_stdout 
Print errors to stdout in salt-key as it's done in salt and salt-run.
 2016-09-09 19:03:32 +09:00
Mike Place
40127b6bf3 Merge pull request #36068 from rallytime/fix-35972 
Remove grains type deprecation warning from 2016.3
 2016-09-09 19:00:50 +09:00
Mike Place
31b2ef2585 Merge pull request #36124 from twangboy/linux_acl_test_mac 
Skip test on all OS's but linux
 2016-09-09 18:59:35 +09:00
Mike Place
afd0eb8f18 Merge pull request #36160 from terminalmage/fix-nested-indent 
Allow for nested outputter to accept base indentation level as a kwarg
 2016-09-09 18:46:11 +09:00
Mike Place
24bd03734d Merge pull request #36152 from cachedout/issue_36094 
Remove unnecessary unpack
 2016-09-09 18:13:46 +09:00
Nicole Thomas
f82c91dbd4 Merge pull request #36174 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-08 17:28:35 -06:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
dc3a68ed8c Merge pull request #36158 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-08 15:53:49 -06:00
Joseph Hall
1a7996125a Fix breakage from updates to __utils__ (#36168) 2016-09-08 15:49:45 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
Nicole Thomas
24b0387b92 Back-port #36070 to 2015.8 (#36169) 2016-09-08 15:48:44 -06:00
twangboy
e6b34c414d Add missing import (lint) 2016-09-08 15:37:21 -06:00