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
81,422 Commits 24 Branches 182 Tags 341 MiB
ecb962cdee
Commit Graph

81422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
ecb962cdee Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-02 09:00:22 -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
Mike Place
42967eab99 Merge pull request #40893 from tonybaloney/libcloud_state 
Improvements to libcloud modules
 2017-05-01 13:58:25 -06: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
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
Nicole Thomas
1db2db6c39 Merge pull request #40989 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-01 12:52:36 -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
fc853d8c01 Merge pull request #40942 from basepi/azurefs 
Fix azurefs
 2017-05-01 12:03:47 -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
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/pip.py
 2017-05-01 10:45:19 -06:00
rallytime
a9fb83c28c Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-01 10:43:45 -06:00
Mike Place
e4ed19a6b3 Merge pull request #40982 from ezh/fabric-fix-docker-event-fields 
Fix docker_events field handling
 2017-05-01 08:22:49 -06:00
Alexey Aksenov
09900d4fe4 Fix docker_events field handling 
[DEBUG   ] Sending event: tag = salt/engines/docker_events/attach; data = {'Type': 'container', 'from': 'a58442926dc0', 'Actor': {'Attributes': {'image': 'a58442926dc0', 'name': 'brave_banach'}, 'ID': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16'}, 'id': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16', 'time': 1493620435, 'status': 'attach', '_stamp': '2017-05-01T06:33:55.078234', 'Action': 'attach', 'timeNano': 1493620435077227350}
Traceback (most recent call last):
  File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/engines/docker_events.py", line 83, in start
    fire('{0}/{1}'.format(tag, data['status']), data)
KeyError: 'status'
[INFO    ] Process <class 'salt.engines.Engine'> (21196) died with exit status 0, restarting...
 2017-05-01 10:25:28 +03:00
Erik Johnson
8f7e8e4829 Merge pull request #40974 from urbas/conf-master-typo 
Fixes typo in conf/master.
 2017-04-30 22:25:05 -05:00
Matej Urbas
b9591f2807 Fixes typo in conf/master. 
s/utililzed/utilized/
 2017-04-30 11:47:54 +01:00
Anthony Shaw
bb62c73b1b
clean up dns test method 2017-04-29 10:48:04 +10:00
Anthony Shaw
1c808dbbc0
inherit from dicts for test classes 2017-04-29 09:55:27 +10:00
twangboy
523316f0d7 Update Python and Deps 2017-04-28 17:19:15 -06:00
Anthony Shaw
d9ee7b3b7f Fix class rename errors. 2017-04-29 08:28:28 +10:00
Anthony Shaw
e92a7ba660 Merge branch 'develop' into libcloud_state 2017-04-29 07:43:28 +10:00
Colton Myers
91878bdab6
Fix lint 2017-04-28 12:32:21 -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
37dff3871e Merge pull request #40956 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-28 11:22:00 -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
rallytime
13a09fc31d Remove extra line left over from merge conflict resolution 2017-04-28 10:13:47 -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
f875ee3309 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - tests/integration/runners/test_runner_returns.py
 2017-04-28 09:26:26 -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
637be4e287 Merge pull request #40746 from dis-xcom/develop 
Add possibility to specify multiple disks in 'virt' module
 2017-04-28 06:57:00 -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