valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,069 Commits 24 Branches 182 Tags 341 MiB
044e0b2063
Commit Graph

81069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
044e0b2063 Merge pull request #40860 from twangboy/change_broadcast 
Remove dependency on win32gui
 2017-05-02 10:45:51 -06:00
Mike Place
64eae1ab84 Merge pull request #40972 from ezh/fabric-fix-2-ssh_py_shim 
[#40971] Fix TypeError: must be str, not bytes for ssh_py_shim
 2017-05-02 10:06:24 -06:00
Mike Place
1f83498f9d Merge pull request #40980 from ezh/fabric-fix-docker-json 
Fix docker_events TypeError
 2017-05-02 09:58:09 -06:00
Mike Place
2cad90dd9e Merge pull request #40996 from terminalmage/issue40946 
Do not automatically unmask services to start/restart/etc. them
 2017-05-02 09:56:23 -06:00
Nicole Thomas
a79e43a913 Merge pull request #40998 from terminalmage/issue39349 
Fix some git_pillar integration test failures
 2017-05-01 17:18:16 -06:00
Erik Johnson
39157b40ed Fix some git_pillar integration test failures 
For some reason these were not failing when I opened #40777, but now
that the PR is merged are failing for PR builds (as well as locally in
my test env). This fixes those failures.
 2017-05-01 17:13:42 -05:00
Erik Johnson
26d2f4a52a Do not automatically unmask services to start/restart/etc. them 2017-05-01 16:01:35 -05:00
Mike Place
5e4babba89 Merge pull request #40964 from twangboy/update_deps 
Update Python and Deps for Py2 on Windows
 2017-05-01 13:55:26 -06:00
Mike Place
f766c97e26 Merge pull request #40777 from terminalmage/issue39349 
Add git_pillar integration tests
 2017-05-01 13:51:19 -06:00
Mike Place
6cfe7be47e Merge pull request #40994 from gtmanfred/file_tree 
only template pillar_tree files if specified
 2017-05-01 13:42:02 -06:00
Shane Lee
b442396bfe Merge pull request #4 from cachedout/pr-40860 
Fix failing test
 2017-05-01 13:24:38 -06:00
Nicole Thomas
a7c15b7c36 Merge pull request #40990 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-01 12:52:54 -06:00
Daniel Wallace
92fd24c107 only template pillar_tree files if specified 
This should only be templated if the user specifies that it should be
templated, otherwise we get a similar problem that is fixed here

https://github.com/saltstack/salt/pull/40464

Fixes #40978
 2017-05-01 12:20:39 -06:00
Mike Place
678595f869 Merge pull request #40944 from gtmanfred/cloud 
allow dynamic loading of cloud drivers
 2017-05-01 12:02:40 -06:00
Mike Place
9d12a614b7
Fix failing test 2017-05-01 11:50:39 -06:00
Alexey Aksenov
bf2eb63a77 Fix docker_events TypeError 
Traceback (most recent call last):
  File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/engines/docker_events.py", line 82, in start
    data = json.loads(event)
  File "/usr/lib64/python3.4/json/__init__.py", line 312, in loads
    s.__class__.__name__))
TypeError: the JSON object must be str, not 'bytes'
[INFO    ] Process <class 'salt.engines.Engine'> (12581) died with exit status 0, restarting...
 2017-05-01 20:04:00 +03:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/pip.py
 2017-05-01 10:45:19 -06:00
Alexey Aksenov
119dcad72d Fix TypeError: must be str, not bytes for ssh_py_shim 
salt-ssh '*' test.ping
...
[DEBUG   ] RETCODE localhost: 1
[DEBUG   ] SHIM retcode(1) and command: Traceback (most recent call last):
[DEBUG   ] LazyLoaded raw.output
{'ezh': {'stdout': 'Traceback (most recent call last):\n  File "<string>", line 155, in <module>\n  File "<string>", line 264, in <module>\n  File "<string>", line 251, in main\nTypeError: must be str, not bytes', 'retcode': 1, 'stderr': 'command-line line 0: Unsupported option "gssapiauthentication"\r\nConnection to localhost closed.\r\n'}
 2017-05-01 19:20:58 +03:00
twangboy
523316f0d7 Update Python and Deps 2017-04-28 17:19:15 -06:00
Erik Johnson
402be207b2 Skip Pygit2 tests until EPEL fixes pygit2/libgit2 version mismatch 
We can revert this commit once they get the updated pygit2 pushed to
EPEL stable.
 2017-04-28 13:25:02 -05:00
Nicole Thomas
fc26fb8a05 Merge pull request #40958 from rallytime/bp-40939 
Back-port #40939 to 2016.11
 2017-04-28 12:01:17 -06:00
Nicole Thomas
a586e12180 Merge pull request #40957 from rallytime/bp-38115 
Back-port #38115 to 2016.11
 2017-04-28 12:01:01 -06:00
Nicole Thomas
00a15eba60 Merge pull request #40905 from rkgrunt/40635 
Fixed issue with parsing of master minion returns when batching is en…
 2017-04-28 11:52:31 -06:00
Nicole Thomas
bb50d4f646 Merge pull request #40954 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-28 10:41:49 -06:00
Nicole Thomas
fba146ced4 Merge pull request #40955 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-28 10:27:03 -06:00
Ch3LL
3e9394862f allow vmware to query deploy arg from opts 2017-04-28 09:30:00 -06:00
C. R. Oldham
eb889173b0 Revert "fix augeas module so shlex doesn't strip quotes" 2017-04-28 09:28:46 -06:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
 2017-04-28 09:23:42 -06:00
rallytime
7f31e41aa6 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pip.py
 2017-04-28 09:20:59 -06:00
Mike Place
883adbbe76 Merge pull request #40792 from s0undt3ch/features/py3 
Reduce mem leaks on py3 test runs & Py3 Fixes
 2017-04-28 09:15:39 -06:00
Daniel Wallace
3a26d5d42d add cloud to saltutil sync test 2017-04-28 09:12:05 -06:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531 
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
 2017-04-28 06:56:05 -06:00
Pedro Algarvio
fc90c8ec06
Switch how IOLoop's are run on these tests 2017-04-28 13:36:45 +01:00
Pedro Algarvio
e6ee82e7be
The expected error message is different on py2 and py3 2017-04-28 13:36:45 +01:00
Pedro Algarvio
75c035f09f
Fix basic stats when the test daemons are not running 2017-04-28 13:36:45 +01:00
Pedro Algarvio
e31858c06d
Somehow tornado.ioloop was None during a test run 2017-04-28 13:36:44 +01:00
Pedro Algarvio
d65742c066
Delete attributes 2017-04-28 13:36:44 +01:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Pedro Algarvio
4b59c351e4
This branch no longer targets py 2.6 2017-04-28 13:33:37 +01:00
Pedro Algarvio
7b503e562b
Use setUpClass instead of __init__ 2017-04-28 13:33:37 +01:00
Pedro Algarvio
0ae04c01ef
Delete all attributes even strings, boolean, integers 2017-04-28 13:33:37 +01:00
Pedro Algarvio
a0da182e0c
Setup console logging 2017-04-28 13:33:37 +01:00
Pedro Algarvio
2c6725d96e
Tell python that we're done with this dictionary 2017-04-28 13:33:37 +01:00
Pedro Algarvio
50629ac1d4
Create a map of log levels to log names. 
Add temporary logging handler subclasses to better identify which
loggers are used for what.
 2017-04-28 13:33:36 +01:00
Pedro Algarvio
9a3f6d1350
Properly handle non native strings under py2 and py3 2017-04-28 13:33:36 +01:00
Pedro Algarvio
5ed3d8d98c
Don't error out because of bad file descriptor errors 2017-04-28 13:33:36 +01:00
Pedro Algarvio
102d63e238
Use self.addCleanup instead 2017-04-28 13:33:36 +01:00
Pedro Algarvio
88627d312f
Write the generated configuration into a config file 2017-04-28 13:33:36 +01:00
Pedro Algarvio
ef3dbb10de
Lint fixes 2017-04-28 13:33:35 +01:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly. 2017-04-28 13:33:35 +01:00