valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,640 Commits 24 Branches 182 Tags 341 MiB
612e342c70
Commit Graph

49640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Stanislav Blokhin
39ce3127cd Let utils.aws query instance metadata 
s3fs fileserver and s3 pillar backend both use utils.aws to query
Amazon S3 API. This change avoids setting hard-coded fallback values
and rather forwards None values of key and keyid so that
utils.aws can make the fallback decision.

Fallback features:

* pillar.s3.ext_pillar() allows key and keyid to be empty
* utils.s3.query() does not use utils.iam anymore to retrieve
credentials from EC2 instance meta-data
* utils.s3.query() falls back on setting empty key & keyid to magical
value from utils.aws.IROLE_CODE to let utils.aws.sig4() fill in
credentials from EC2 meta-data.

utils.aws features:

X-Amz-Security-Token header, which is necessary when using temporary
credentials from IAM roles, now properly signed.
 2015-08-18 08:58:16 +02:00
Colton Myers
c5eb6bbd3e Merge pull request #26409 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-08-17 17:19:56 -06:00
Colton Myers
dafed10a9e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
     salt/master.py
 2015-08-17 15:55:55 -06:00
Mike Place
741ca6b4db Merge pull request #26406 from jfindlay/lvm 
fix syntax error in lvm exec module
 2015-08-17 15:18:25 -06:00
Mike Place
a7e2d30e2a Merge pull request #26405 from TheBigBear/patch-8 
dependency zip files moved to new site
 2015-08-17 15:17:24 -06:00
Justin Findlay
81d351ff8f fix syntax error in lvm exec module 
Fixes #26404.
 2015-08-17 15:16:18 -06:00
Colton Myers
cf0523a12e Merge pull request #26298 from vr-jack/2015.5 
Keep $HOME from being interpretted by Master shell
 2015-08-17 15:15:11 -06:00
TheBigBear
8898d64918 dependency zip files moved to new site 2015-08-17 22:01:50 +01:00
Mike Place
c0811d3302 Merge pull request #26324 from s0undt3ch/2015.5 
Salt is now pip install'able in windows
 2015-08-17 14:41:34 -06:00
Mike Place
87151736c5 Merge pull request #26371 from bastiaanb/fix/issue-26161-salt-initscripts-dont-set-lockfile 
fix issue #26161: on RedHat family systems touch /var/lock/subsys/$SE…
 2015-08-17 14:39:28 -06:00
Mike Place
89602f56ad Merge pull request #26402 from twangboy/fix_26328 
Removed documentation no longer required
 2015-08-17 14:35:37 -06:00
twangboy
ad5fa03b76 Removed documentation no longer required 2015-08-17 14:18:31 -06:00
Justin Findlay
eb373e5904 Merge pull request #26392 from rallytime/bp-26376 
Back-port #26376 to 2015.5
 2015-08-17 13:39:51 -06:00
Mike Place
8bb57d1631 Merge pull request #26342 from rallytime/fix-16049 
Don't call boto_elb._attributes_present if no attributes were provided
 2015-08-17 13:19:08 -06:00
Mike Place
2fd1e06343 Merge pull request #26389 from rallytime/bp-26160 
Back-port #26160 to 2015.5
 2015-08-17 13:09:16 -06:00
Thomas S Hatch
0046c6cfed Merge pull request #26300 from jfindlay/pw_test 
mock pwd function calls in pw_user exec module
 2015-08-17 12:56:41 -06:00
Pedro Algarvio
e7cb3be2a0 Document the added options 2015-08-17 19:48:48 +01:00
Pedro Algarvio
92af1c9572 Fix argument name 2015-08-17 19:48:48 +01:00
Pedro Algarvio
72d2fdb512 Add pypiwin32 >= 219 as a windows install requires. 
Refs #26305
 2015-08-17 19:48:48 +01:00
Pedro Algarvio
b1105fc706 Allow mimicking the install setup command for develop/editable installations. 
To generate Salt's _syspaths.py file, pass `--generate-salt-syspaths` to
the develop command or set the `GENERATE_SALT_SYSPATHS` environment
variable.

Passing `--mimic-salt-install` to the develop command or setting the
`MIMIC_SALT_INSTALL` environment variable will generate `_version.py` and `_syspaths.py`

Fixes #11046
Fixes #25094
 2015-08-17 19:48:46 +01:00
Pedro Algarvio
26246a72ee Allow writing Salt's _version.py when installing in develop mode. 
Pass `--write-salt-version` or set the `WRITE_SALT_VERSION` environment
variable to trigger the generation of `_version.py`.

Closes #25094
 2015-08-17 19:48:00 +01:00
Pedro Algarvio
71928f2194 Prefer HTTPS, fix url argument 2015-08-17 19:48:00 +01:00
Pedro Algarvio
7b25430cc7 Download the necessary DLLs for windows 2015-08-17 19:48:00 +01:00
Pedro Algarvio
86692a92cd Install PyCrypto from a wheel in repo.saltstack.com under Windows 2015-08-17 19:48:00 +01:00