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
69,797 Commits 24 Branches 182 Tags 341 MiB
db3cc8dcee
Commit Graph

69797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tom Williams
102d696460 INFRA-1594 - fix up unit tests 2016-06-06 14:37:38 -04: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
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
Nicolas Delaby
9ad99c6816 We now that boto3 is not used in this module 2016-06-06 15:56:17 +02:00
Mike Place
21417a2e11 Merge pull request #33572 from remyd1/custom-net-ps-modules 
Custom net ps modules
 2016-06-06 04:17:10 -07:00
Mike Place
89fe07830b Merge pull request #33775 from jf/allow-sys.list_modules-to-list-exact-match 
Allow sys.list modules to list exact match
 2016-06-06 03:48:06 -07:00
remy.d1
31f58144b4 remove find_non_std... because except File SystemHierarchythere is not a true real standard 2016-06-06 09:04:02 +02:00
remy.d1
e1e016de94 Merge branch 'develop' of https://github.com/saltstack/salt into custom-net-ps-modules 2016-06-06 09:02:07 +02:00
Tom Williams
6f74315237 INFRA-1594 - Heh, I sure didn't BREAK it but WTH, I'll fix it anyway :) Only delete 'ResponseMetadata' from returned data if it is in there to begin with... 2016-06-05 18:03:22 -04:00
Tom Williams
ba62032d46 INFRA-1594 - disable pylint complaints about perfectly valid code 2016-06-05 15:07:23 -04:00
Tom Williams
e8bf0986a8 INFRA-1594 - I stupidly locked the boto3 version to the needed botocore version :-/ Fixed and added a separate check for botocore 2016-06-05 14:50:28 -04:00
Tom Williams
4aab4fa10b INFRA-1594 - Fix pylint whinging 2016-06-05 14:32:29 -04:00
Tom Williams
e33cc1b4bc INFRA-1594 - Add various S3 functions needed for optionally emptying S3 buckets before deleting them. Also updates to work with (and require) recent botocore bugfixes 2016-06-04 22:36:14 -04:00
Jeffrey 'jf' Lim
9cf25e160f Fix #33500: allow for sys.list_modules to list a module when given an exact match 2016-06-04 12:51:47 +08:00
Jeffrey 'jf' Lim
738e5c5823 Fix integration test_list_modules_with_arg: pass 'u*' arg correctly 2016-06-04 12:18:16 +08:00
Jεan Sacren
da2ec937b8 Fix returning 'UTC' as default 
In the absence of /etc/adjtime, we should check /etc/conf.d/hwclock for
the correct timescale rather than return 'UTC' as default on Gentoo.
 2016-06-03 16:23:07 -06:00
Mike Place
d90448a3c3 Merge pull request #33755 from cro/proxy_in_opts 
Add default proxy config directories /etc/salt/proxy.d & config in opts
 2016-06-03 12:28:14 -07:00
Mike Place
3eb231a245 Merge pull request #33756 from ticosax/remove-docker-workaound-require-160 
[dockerng] remove limitation in port_binding range
 2016-06-03 10:56:59 -07:00
Nicolas Delaby
f48c7c2787 remove limitation in port_biding range 
By bumping minimum supported version of docker to 1.6.0
 2016-06-03 18:31:52 +02:00
C. R. Oldham
8332e6f94e Add default proxy config directories /etc/salt/proxy.d and ability for proxies to be configured by opts in addition to pillar 2016-06-03 10:11:34 -06:00
Mike Place
4e27bfaa5b Merge pull request #33731 from plastikos/improvement-ensure_parser_messages_have_newline 
[Trivial] Ensure that option parser messages have a newline.
 2016-06-03 08:45:37 -07:00
Mike Place
3f4d4de9ea Merge pull request #33734 from glomium/issue33588 
modules/rabbitmq.py version checking had a logical error
 2016-06-03 08:44:46 -07:00
Mike Place
c5e24782f6 Merge pull request #33736 from nmadhok/patch-1 
call copy.deepcopy properly and pass it opts
 2016-06-03 08:39:27 -07:00
Mike Place
4a9ec5af9d Merge pull request #33737 from hrumph/develop 
Fixed instance of unicode/str comparison and made it unicode/unicode
 2016-06-03 08:37:11 -07:00
Mike Place
7bf36c839c Merge pull request #33738 from quxf2012/patch-1 
Update mysql.py
 2016-06-03 08:35:08 -07:00
Mike Place
1001d2b9e7 Merge pull request #33733 from plastikos/test-master_exit_status 
Test master exit status
 2016-06-03 08:27:28 -07:00
Mike Place
4bee3bc9c1 Merge pull request #33735 from jacksontj/develop 
Fix `force` lock for zk_concurrency
 2016-06-03 08:26:27 -07:00
Mike Place
38b7495854 Merge pull request #33749 from netmanagers/develop 
Add example in the docs for varstack as a master_tops
 2016-06-03 08:19:05 -07:00
Nicolas Delaby
5603deb72e Add boto_asg.enter_standby and boto_asg.exit_standby 2016-06-03 17:03:27 +02:00
C. R. Oldham
35bc42410f Merge pull request #33705 from alexbleotu/json_schema_extension-gh 
JSON Schema Extension
 2016-06-03 08:42:18 -06:00
Alexandru Bleotu
d69ce3a84f JSON Schema Extension 
- added support for JSON schemas that validate complex JSON objects
  (JSON objects that have as attributes other JSON objects)
 2016-06-03 14:03:26 +01:00
Javier Bértoli
9c587c477d Add example in the docs for varstack as a master_tops 2016-06-03 06:58:30 -03:00
quxf2012
a5faf691b7 Update mysql.py 
Fixes mysql.grant_exists bug
If a user both have select, update privilege,when check one privilege will return False
 2016-06-03 14:46:37 +08:00
quxf2012
ad0ba18e3e Update mysql.py 
If a user both have  select, update privilege,when check one privilege will return False
 2016-06-03 12:09:10 +08:00
Michael Walton
b887f92fa7 Merge remote-tracking branch 'upstream/develop' into develop 2016-06-02 23:54:28 -04:00
Michael Walton
75f10c5ceb Fixed instance of unicode/str comparison and made it unicode/unicode 2016-06-02 23:40:25 -04:00
Nitin Madhok
0c31df4665 call copy.deepcopy properly and pass it opts 
opts does not have copy.deepcopy attribute
 2016-06-02 22:48:32 -04:00
Thomas Jackson
de19065367 Fix force lock for zk_concurrency 
If all leases where currently held force would not work. This works around the issue by setting the local max leases to maxint-- to let you grab the lock always
 2016-06-02 17:04:14 -07:00