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
70,247 Commits 24 Branches 182 Tags 341 MiB
9a856bde82
Commit Graph

70247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nasenbaer
bab9cfa19e Allow concurrent runs for state single 2016-06-07 17:24:53 +02:00
Mike Place
52f1f77a38 Restore deafault log level to warning 
Closes #33818
 2016-06-07 08:48:05 -06:00
Mike Place
3e48b701e3 Merge pull request #33767 from amontalban/2016.3 
Fix #33604 implementation when 'geom disk list' does not output rotat…
 2016-06-07 07:41:56 -07:00
Mike Place
1db559afe9 Merge pull request #33805 from jfindlay/pkg_tests 
states.pkg int tests: skip if pkg mgr unavailable
 2016-06-07 07:40:46 -07:00
Mike Place
3984b65486 Merge pull request #33808 from jfindlay/gem_tests 
fix some problems with the gem module integration tests
 2016-06-07 07:40:25 -07:00
Mike Place
a84588c788 Merge pull request #33806 from cachedout/cherrypy_1444 
Work around upstream cherrypy bug
 2016-06-07 07:39:57 -07:00
Mike Place
4c1ca31d52 Merge pull request #33809 from x3dfxjunkie/develop 
Updated puppet module paths for agents >= 4.0.0
 2016-06-07 07:38:41 -07:00
Mike Place
c30d8a8c61 Merge pull request #33770 from jfindlay/service_tests 
service state integration tests
 2016-06-07 07:37:54 -07:00
Mike Place
e061788e81 Merge pull request #33814 from terminalmage/archive-extracted-xz 
Support extraction of XZ archives in archive.extracted state
 2016-06-07 07:36:48 -07:00
Daniel Hobley
8ff5906fad Revert "Fix a bug when creating a new VM and changing the network info" 
This reverts commit 7834aeda7d.
 2016-06-07 11:41:22 +02:00
Erik Johnson
897a716df2 Support extraction of XZ archives in archive.extracted state 
Using an XZ-compressed archive with archive.extracted raises a
tarfile.ReadError exception, as only gzip and bzip2 are supported by
tarfile. This commit catches that exception and attempts to extract
using xz-utils, if present.

It also makes some clarifications and corrections to the documentation.
 2016-06-07 02:07:30 -05:00
Justin Findlay
f13f914755 states.service: add integration tests 2016-06-06 23:11:49 -06:00
Justin Findlay
f7c19a1a58 modules.gem int tests: relax version checks 2016-06-06 21:58:58 -06:00
twangboy
60f856f73d Fix unit tests for module 2016-06-06 18:33:29 -06:00
twangboy
b574947afe Fix some lint errors 2016-06-06 18:08:17 -06:00
Russell Anderson
7f94032c0a Updated puppet module paths for agents >= 4.0.0 
Puppet module passing checks again.  The puppet_test unit test script
provides a blank puppet --version output, which was messing with
re.match and version compare.
 2016-06-06 19:48:38 -04:00
Justin Findlay
0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable 2016-06-06 17:44:43 -06:00
twangboy
a32774c07d Add salt.utils.compare_lists 2016-06-06 17:43:15 -06:00
Justin Findlay
6af47d2ba7 modules.gem int tests: remove pkgs before testing install 2016-06-06 17:32:17 -06:00
twangboy
7ff7050705 Fix incorrect parameters in the state 2016-06-06 17:28:39 -06:00
twangboy
b8ee89f18e Fix typos 2016-06-06 17:04:02 -06:00
Mike Place
1b537d41b6 Work around upstream cherrypy bug 
Refs https://github.com/cherrypy/cherrypy/issues/1444
 2016-06-06 16:54:06 -06:00
twangboy
10458d8a70 Remove multiple lookups, faster 2016-06-06 16:50:37 -06:00
twangboy
d9b848c0d9 Change to dict instead of error 2016-06-06 16:33:24 -06:00
Mike Place
c3817cff3c Merge pull request #33724 from silenius/dns 
Dns
 2016-06-06 14:53:20 -07:00
Mike Place
db3cc8dcee Merge pull request #33779 from bodhi-space/develop 
INFRA-1594 - Add various S3 functions needed for optionally emptying …
 2016-06-06 14:52:07 -07:00
Mike Place
49b48df165 Merge pull request #33802 from kraney/boto_apigateway 
for options method, always create it with api_key_required parameter …
 2016-06-06 14:51:05 -07:00
twangboy
6510e0a5b0 Add restart option 2016-06-06 15:12:43 -06:00
twangboy
da8562dbc8 Add quiet and norestart options 2016-06-06 14:58:38 -06:00
Mike Place
1478e83828 Merge pull request #33796 from heewa/log-fileclient-err-msg 
Log err msg when failed to hash a file
 2016-06-06 13:58:04 -07:00
twangboy
946371bf1f Handle errors, ensure add/remove 2016-06-06 14:34:46 -06:00
Mike Place
f16aca6f2c Merge pull request #33800 from heewa/error-on-s3-failures 
Raise exception on S3 failures
 2016-06-06 13:14:41 -07:00
Winston Liu
aa5b72445b for options method, always create it with api_key_required parameter equaling False, otherwise CORS support will not work properly. 2016-06-06 13:04:44 -07:00
Heewa Barfchin
aea12f61f3 Use new exception as var style 2016-06-06 15:45:14 -04:00
Mike Place
da4169bb01 Merge pull request #33799 from jf/typos 
Fix minor typo in test name in tests/unit/states/dockerng_test.py
 2016-06-06 12:15:07 -07:00
twangboy
7e6382a8b2 Use list instead of string for cmd 2016-06-06 12:58:34 -06:00
Tom Williams
102d696460 INFRA-1594 - fix up unit tests 2016-06-06 14:37:38 -04:00
twangboy
fbdd28f144 Add state functions 2016-06-06 12:21:49 -06:00
Jeffrey 'jf' Lim
ffa788fd67 Fix minor typo in test name in tests/unit/states/dockerng_test.py 2016-06-07 01:11:30 +08:00
twangboy
90a4ee3d96 Merge branch '2016.3' of https://github.com/saltstack/salt into win_dism 2016-06-06 10:54:34 -06:00
Justin Findlay
90aee79c39 states.service.mod_watch: update unit test 2016-06-06 10:54:16 -06:00
Heewa Barfchin
736f46031b Raise exception on S3 failures 2016-06-06 12:48:44 -04:00
Mike Place
7bcdbd9aeb Merge pull request #33766 from sodium-chloride/develop-2016-0603-1622 
Fix returning 'UTC' as default
 2016-06-06 09:21:39 -07:00
Heewa Barfchin
8cd2de6134 Log err msg when failed to hash a file 2016-06-06 12:20:51 -04:00
Mike Place
5619ff973a Merge pull request #33795 from cachedout/lint_33753 
Lint fixup
 2016-06-06 09:19:28 -07:00
Mike Place
0731e58470 Lint fixup 
Refs #33753
 2016-06-06 10:18:45 -06:00
Mike Place
49306bc736 Merge pull request #33753 from ticosax/boto_asg.standby 
Add boto_asg.enter_standby and boto_asg.exit_standby
 2016-06-06 09:17:49 -07:00
Justin Findlay
d210a92f09 states.service.mod_watch: update sfun and force docs 2016-06-06 10:13:06 -06:00
Nicolas Delaby
9ad99c6816 We now that boto3 is not used in this module 2016-06-06 15:56:17 +02:00
Wolodja Wentland
7975ce009a Do not use KillMode=process for salt-master 
We actually want salt-master processes in the same control group to be
terminated and this was only introduced to fix the 'minion upgrades
itself' problem, which applies to salt-minion, but not to salt-master.

This change was introduced in d288539 to fix #29295, which discusses the
need to include 'KillMode=process' for the salt-minion on Debian
systems.
 2016-06-06 15:36:47 +02:00