valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
43,656 Commits 24 Branches 182 Tags 341 MiB
b721203ed1
Commit Graph

43656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
b7e63884d5 fix zip_file shadowing per #18933 2014-12-12 10:38:52 -07:00
Thomas S Hatch
bc95c6e799 fix the change in location for the exitcodes file 2014-12-12 10:32:19 -07:00
Thomas S Hatch
b9afe18423 Merge pull request #18949 from techhat/awsversion 
Update AWS/EC2 versions to 2014-10-01
 2014-12-12 10:00:34 -07:00
Thomas S Hatch
c154936b5d Merge pull request #18957 from thatch45/basepi-salt-ssh-publish.publish 
Merge #18944
 2014-12-12 09:59:59 -07:00
Thomas S Hatch
9166c22003 lint 2014-12-12 09:59:20 -07:00
Thomas S Hatch
84121e14fe Merge branch 'salt-ssh-publish.publish' of https://github.com/basepi/salt into basepi-salt-ssh-publish.publish 2014-12-12 09:58:38 -07:00
Thomas S Hatch
bdc907dab6 Merge branch '2014.7' into merge_forward_8798 
Conflicts:
	salt/cli/__init__.py
	salt/cloud/clouds/ec2.py
	salt/scripts.py
	salt/utils/__init__.py
	salt/utils/saltminionservice.py
 2014-12-12 09:49:34 -07:00
Thomas S Hatch
a1406d103e Merge pull request #18913 from xhenner/develop 
Make /etc/salt-master usefull
 2014-12-12 09:41:56 -07:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop 
More grammar/style cleanup
 2014-12-12 09:40:55 -07:00
Thomas Jackson
0e6195f778 Add some tests for ThreadPool 2014-12-12 08:16:18 -08:00
Thomas Jackson
77a7d9ab13 backport tests for process manager 2014-12-12 08:04:02 -08:00
Thomas Jackson
0026b544b3 Mark the task as done as soon as you pull it. 
Ff there is an exception while running the func, that doesn't mean we should keep trying
 2014-12-12 08:01:06 -08:00
Thomas Jackson
06e9b02ac9 Instantiate the threadpool *after* forking. 2014-12-12 08:00:46 -08:00
Thomas Jackson
e19b360e1a Clarify comment 2014-12-12 07:38:28 -08:00
Thomas Jackson
83ecb5eedb Add debug logging to threadpool targets 2014-12-12 07:38:09 -08:00
Seth House
91c40e37fc Merge pull request #18952 from techhat/serialcomma 
Add serial commas to the style guide
 2014-12-12 08:01:14 -07:00
Rupesh Tare
c86bdb6c16 created unit test case for function atq from module at 2014-12-12 19:23:22 +05:30
Jayesh
b69d81ee69 Added test case 2014-12-12 17:20:31 +05:30
Joseph Hall
7099c02a53 Add serial commas to the style guide 2014-12-12 03:30:11 -07:00
Joseph Hall
e4c9c26b79 Merge pull request #18948 from walgitrus/fix-ec2-toggle-delvol 
fix ec2 instance creation with delete volume enabled (issue #18315)
 2014-12-11 19:39:14 -07:00
Joseph Hall
36f1357791 Update AWS/EC2 versions to 2014-10-01 2014-12-11 19:16:13 -07:00
Joseph Hall
5ab0cdb6a6 Merge pull request #18946 from walgitrus/ec2-encrypted-ebs 
Recognize `encrypted` keyword for ec2 volumes
 2014-12-11 19:13:02 -07:00
walrus
29776df304 fix ec2 instance creation with delete volume enabled (issue #18315) 
- `ec2.query()` requires non-empty `param` argument
- replace `param`-less call to `ec2.query()` with `show_delvol_on_destroy()`
- TODO: remove `requesturl` as none of the callers of `_toggle_delvol()`
  make use of it
 2014-12-11 17:51:19 -08:00
walrus
c0418a91cf Recognize encrypted keyword for ec2 volumes 
- added for both `create_volume()` and `create_attach_volumes()`
- requires EC2 API version `2014-10-01`
- announcment:
  - https://aws.amazon.com/about-aws/whats-new/2014/05/21/Amazon-EBS-encryption-now-available/
 2014-12-11 17:28:39 -08:00
Thomas S Hatch
b848e7ebe8 Merge pull request #18938 from cachedout/jid_util 
Refactor jid utils out of utils/__init__
 2014-12-11 17:27:00 -07:00
Seth House
e14fb950d3 Merge pull request #18945 from wolfpackmars2/patch-3 
Update netapi reference
 2014-12-11 17:17:53 -07:00
Thomas S Hatch
60b1789dee Merge pull request #18934 from hulu/sysrc-set-shadowing 
modules.sysrc: avoid shadowing built-in set type
 2014-12-11 17:16:47 -07:00
David Boucha
ae9f095521 Merge pull request #18937 from highlyunavailable/fix_18935 
Change URL for vcredist_x64 to SP1 DL URL
 2014-12-11 17:15:33 -07:00
Thomas S Hatch
35eba764ff Merge pull request #18930 from s0undt3ch/hotfix/bootstrap-script 
Update to the latest v2014.12.11 stable release
 2014-12-11 17:15:29 -07:00
Steve Groesz
e66a02b18b Update netapi reference 
Resolves issue #18760
 2014-12-11 18:14:47 -06:00
Thomas S Hatch
f88de6c728 Merge pull request #18926 from rallytime/bp-18807 
Backport #18807 to 2014.7
 2014-12-11 17:13:18 -07:00
Thomas S Hatch
d01d24fbff Merge pull request #18925 from UtahDave/fix_win_grain_error 
Don't blow up grains
 2014-12-11 17:13:09 -07:00
Colton Myers
257f3ed539 Fix typo 2014-12-11 17:10:37 -07:00
Colton Myers
155e374584 Use 'return' not 'ret' 2014-12-11 17:09:32 -07:00
Colton Myers
64a4950994 Get the ssh_priv from __master_opts__ if available 2014-12-11 17:08:47 -07:00
Thomas S Hatch
cfdcdecbb7 Merge pull request #18915 from babilen/issue/18909 
Ensure aptpkg._consolidate_repo strips trailing slashes from repo_uri
 2014-12-11 17:08:21 -07:00
Thomas S Hatch
9ba2db9895 Merge pull request #18911 from tomashavlas/develop 
created support from from module import object as alias in pyobjects ren...
 2014-12-11 17:05:27 -07:00
Thomas S Hatch
16b4c9eb74 Merge pull request #18904 from MrCitron/feature-18866 
Feature 18866
 2014-12-11 17:04:39 -07:00
Thomas S Hatch
f277607348 Merge pull request #18942 from thatch45/Unity-Technologies-win-add-unzip 
Merge #18932
 2014-12-11 17:01:48 -07:00
Thomas S Hatch
8e281dedcc lint fix 2014-12-11 16:58:10 -07:00
Mike Place
8094cff06c Merge pull request #18924 from cro/pkgng_fromrepo 
Fix bad option handling for FreeBSD pkgng.
 2014-12-11 16:56:27 -07:00
Mike Place
8e2fa1aaf4 Merge pull request #18940 from wolfpackmars2/patch-2 
Fix missing text
 2014-12-11 16:34:13 -07:00
Steve Groesz
6cb313533b Fix missing text 
Found missing colon, causing code blocks not to display.  This fixes issue #18879
 2014-12-11 17:29:31 -06:00
Colton Myers
0d9bef86f1 Use the __master_opts__ config dir if available (in wfunc) 2014-12-11 16:28:25 -07:00
Colton Myers
e52a5046e9 Handle salt-ssh errors and similar in publish.py wrapper 2014-12-11 16:27:07 -07:00
Mike Place
454da2545f Fix failing tests 2014-12-11 16:23:04 -07:00
Mike Place
70fb8e9055 Add the needed file :] 2014-12-11 15:42:55 -07:00
Mike Place
12a68e9d4f Refactor all the remaining salt.payload deps out of salt.utils 2014-12-11 15:42:25 -07:00
Mike Place
5daf851995 Refactor jid utils out of utils/__init__ 2014-12-11 15:33:01 -07:00
Tiru Srikantha
d1192819c5 Change URL for vcredist_x64 to SP1 DL URL 
Fixes saltstack/salt#18935
 2014-12-11 14:27:32 -08:00