valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,664 Commits 24 Branches 182 Tags 341 MiB
ac67a1d238
Commit Graph

49664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
ac67a1d238 Ensure GCE configuration check is correct 2015-08-21 16:40:03 -06:00
rallytime
421f1fde1e Ensure EC2 configuration check is correct 2015-08-21 16:38:14 -06:00
Justin Findlay
5a32664efd Merge pull request #26553 from rallytime/bp-26548 
Back-port #26548 to 2015.5
 2015-08-21 11:40:21 -06:00
Justin Findlay
7e67e48656 Merge pull request #26552 from rallytime/bp-26542 
Back-port #26542 to 2015.5
 2015-08-21 11:40:11 -06:00
Justin Findlay
bcd462545d Merge pull request #26551 from rallytime/bp-26539 
Back-port #26539 to 2015.5
 2015-08-21 11:39:22 -06:00
Justin Findlay
4dbf61c5af Merge pull request #26549 from rallytime/bp-26524 
Back-port #26524 to 2015.5
 2015-08-21 11:38:50 -06:00
Vasili Akulich
ec2b2c3e40 Catch OSError during cache directories creation, fixes #19249 2015-08-21 09:47:15 -06:00
Arthur Lutz
0976b1e23b [doc] reactor documentation fix : returners 2015-08-21 09:46:04 -06:00
Calle Pettersson
94ff4cff40 Doc-fix: Escape backslash in domain\username 
The unescaped backslash in "mydomain\username" makes it appear like "mydomainusername", slightly confusing the documentation.
 2015-08-21 09:44:20 -06:00
Jens Rantil
4763f28725 logging(cmp_version): output assertion 
Log error. The integer comparison is Python 3 compatible and ripped from
[1]. This will catch incorrectly implemented version comparison
functions.

[1] http://stackoverflow.com/a/3646519/260805
 2015-08-21 09:41:30 -06:00
Jens Rantil
673b6c683d utils(version_cmp): handle comparison not in (0,1,-1) 
See [1]. It fixes it.

[1] https://github.com/saltstack/salt/issues/18652#issuecomment-133073612
 2015-08-21 09:41:30 -06:00
Nicole Thomas
1ac8287588 Merge pull request #26527 from jfindlay/elb 
check exists and values in boto_elb listeners
 2015-08-21 09:27:52 -06:00
Nicole Thomas
e4b2534aa8 Merge pull request #26446 from stanislavb/2015.5-ec2-metadata-region 
Fetch AWS region from EC2 instance metadata
 2015-08-21 09:11:08 -06:00
Justin Findlay
d721b7b2be Merge pull request #26546 from nmadhok/vmware-key-error-patch-2015.5 
Do not raise KeyError when calling avail_images if VM/template is in disconnected state
 2015-08-21 08:17:49 -06:00
Nitin Madhok
1dcf157256 Do not raise KeyError when calling avail_images if VM/template is in disconnected state 2015-08-21 07:10:18 -04:00
Justin Findlay
7da87fabf1 Merge pull request #26537 from jfindlay/note 
Merge #26481
 2015-08-20 23:37:24 -06:00
Justin Findlay
343e47f00c check exists and values in boto_elb listeners 
Fixes #26502.
 2015-08-20 17:40:23 -06:00
Justin Findlay
662e723ae0 fixup note lint in file.replace state mod 2015-08-20 17:06:45 -06:00
Mike Place
c6d8e34730 Merge pull request #26528 from zmalone/2015.5 
Fixing encrypt to instructions in the 2015.5 branch
 2015-08-20 15:49:06 -06:00
Zach Malone
39b111c465 Fixing encrypt to instructions in the 2015.5 branch, --homedir is not necessary here. 2015-08-20 12:36:54 -06:00
Stanislav Blokhin
57943ff4f7 Fetch AWS region from EC2 instance metadata 
sig4() and query() upon getting a location set to None will attempt
to fetch it from EC2 instance metadata before falling back to
us-east-1.

get_region_from_metadata() uses caching just like creds() does. If
it can't connect to the metadata service, it does not try again.
If a value is successfully retrieved, it is cached so that future
calls are faster.

get_location() will call get_region_from_metadata() if location is
not explicitly set in config.

If sig4() receives an empty location value, it tries to
fetch it using get_region_from_metadata()
 2015-08-20 20:24:05 +02:00
Justin Findlay
612e342c70 autogenerated 2015.5.5 release notes 2015-08-20 11:08:56 -06:00
Colton Myers
28aa9b1058 Merge pull request #26486 from thusoy/git-confidential-auth 
Git: Don't leak https user/pw to log
 2015-08-20 10:04:52 -06:00
Tarjei Husøy
5289165487 Git: Don't leak https user/pw to log 2015-08-19 23:58:08 -07:00
Mike Place
679ba5ee0a Merge pull request #26476 from jacobhammons/doc-bugs 
Minor doc bug fixes
 2015-08-19 16:52:34 -06:00
Mike Place
42b8c1b3f4 Merge pull request #26443 from cachedout/fix_event_sub 
Fix connect issue in event init
 2015-08-19 16:50:22 -06:00
Mike Place
d2df1a86ad Merge pull request #26445 from cachedout/issue_26343 
Raise clean error when no minions targeted in batch mode
 2015-08-19 16:50:07 -06:00
Mike Place
a9b28e9577 Merge pull request #26483 from thusoy/git-user-only-auth 
Handle user-only http auth in git module
 2015-08-19 16:47:41 -06:00
Mike Place
edc04930ae Merge pull request #26496 from jfindlay/dateutil 
add dateutil dependency reporting
 2015-08-19 16:46:31 -06:00
Justin Findlay
cbe330e78b add dateutil dependency reporting 2015-08-19 14:47:28 -06:00
Mike Place
4fff53b842 Merge pull request #26494 from cachedout/remove_debug_statements 
Remove unecessary debug statements
 2015-08-19 14:46:00 -06:00
Jenkins
d717a43dcc Remove unecessary debug statements 
These were throwing errors on some platforms:

Traceback (most recent call last):
  File "/testing/tests/unit/modules/random_org_test.py", line 296, in test_generateblobs
    format='hex'), ret6)
  File "/testing/salt/modules/random_org.py", line 743, in generateBlobs
    result = _query(api_version=api_version, data=data)
  File "/testing/salt/modules/random_org.py", line 125, in _query
    log.debug('result {0}'.format(result.text))
AttributeError: 'dict' object has no attribute 'text'
 2015-08-19 14:44:16 -06:00
Tarjei Husøy
09fc934acc Handle user-only http auth in git module 2015-08-19 11:46:30 -07:00
TheBigBear
332535f2e6 Update file.py 2015-08-19 19:26:06 +01:00
TheBigBear
598500034f Update file.py 2015-08-19 19:25:07 +01:00
TheBigBear
ec7c7d738d minor note: added 
note based on findings in #25360
 2015-08-19 19:16:28 +01:00
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
Justin Findlay
f46a0dab5d Merge pull request #26465 from rallytime/bp-26457 
Back-port #26457 to 2015.5
 2015-08-19 10:08:16 -06:00
Arthur Lutz
b3f638ff0f docstring improvement for network.ping module execution 2015-08-19 08:47:24 -06:00
Mike Place
1600f3eccd Raise clean error when no minions targeted in batch mode 
Closes #26343
 2015-08-18 14:46:49 -06:00
Mike Place
560977bc7e Fix connect issue in event init 
Fix issue with 100% CPU. Refs #26366 and #26301.
 2015-08-18 14:07:22 -06:00
Colton Myers
c1458980f3 Merge pull request #26434 from s0undt3ch/2015.5 
Fix missed typo
 2015-08-18 12:14:29 -06:00
Mike Place
0f64be710f Merge pull request #26430 from rallytime/fix-26426 
List public and private ips under the correct label
 2015-08-18 10:20:32 -06:00
Pedro Algarvio
06dcaefcaa Fix missed typo 2015-08-18 17:18:59 +01:00
Nicole Thomas
913451a414 Merge pull request #26431 from rallytime/bp-26417 
Back-port #26417 to 2015.5
 2015-08-18 09:41:58 -06:00
scottjpack
0254a2e90e Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-18 09:22:57 -06:00
rallytime
2ba97316c9 List public and private ips under the correct label 
Fixes #26426
 2015-08-18 09:19:26 -06:00
Mike Place
952da7abaf Merge pull request #26378 from stanislavb/2015.5 
Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5
 2015-08-18 08:01:53 -06:00
Mike Place
09e96dce39 Merge pull request #26420 from terminalmage/issue26245-2015.5 
Only use pygit2.errors if it exists (2015.5 branch)
 2015-08-18 08:00:01 -06:00
Erik Johnson
19a1149067 Only use pygit2.errors if it exists (2015.5 branch) 
pygit2 0.20.3 is the only supported pygit2 for gitfs which doesn't have
this errors submodule. We need to account for it not being there.

Fixes #26245 for the 2015.5 branch
 2015-08-18 03:29:52 -05:00