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
87,031 Commits 24 Branches 182 Tags 341 MiB
71f2bc4776
Commit Graph

87031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
1baf286719 Merge pull request #43943 from twangboy/win_unit_test_utils 
Fix `unit.utils.test_utils` for Windows
 2017-10-06 13:35:23 -06:00
Erik Johnson
9a4f6a260f
Fix fileclient's get_url when redirecting to a redirect 
When a 30x leads to a 200 OK, we properly reset write_body[0] so that we
save the body of the response. However, when both A) a 30x redirects to
another 30x and B) we've already determined the encoding from the
Content-Type (and thus set write_body[2]), then we don't properly set
write_body[0], resulting in a zero-length file. This commit fixes this
by also resetting the write_body[2] when following redirects, so that we
make sure we are getting the encoding for the request to the URL that
resulted in the 200 instead of the one that resulted in the 30x.
 2017-10-06 13:51:06 -05:00
Daniel Wallace
1f8ec5d335 Merge branch 'develop' into vagrant-module 2017-10-06 11:32:31 -06:00
Kunal Ajay Bajpai
10966d6ab0 Merge branch 'fix_id_cache' of https://github.com/kunal-bajpai/salt into fix_id_cache 2017-10-06 22:02:12 +05:30
Kunal Ajay Bajpai
5a852c815c Do not raise exception 2017-10-06 22:02:06 +05:30
Pablo Suárez Hernández
44bc91bb98
Enable '--with-salt-version' parameter for setup.py script 2017-10-06 17:12:15 +01:00
garethgreenaway
11c7d3ab39 Merge branch 'develop' into unit-test-sdb 2017-10-06 07:28:42 -07:00
Joseph Hall
11e577b9ce
Add deps message to __virtual__() 2017-10-06 07:55:04 -06:00
Nicole Thomas
d136650b31 Merge pull request #43938 from terminalmage/salt.utils.user 
Move several functions from salt.utils to salt.utils.user
 2017-10-06 09:42:42 -04:00
Massimiliano Torromeo
63961cc7d9 Copy git ssh-id-wrapper to /tmp only if necessary (Fixes #10582, Fixes #19532) 
This adds a check that only copies the ssh wrapper to a temporary
location if git is to be run by a specific user and at the same time
the predefined wrapper file is not executable by "others" by verifying
every path part for the others executable bit.

By doing this the temp file is kept only as a last resort which should
work with salt-ssh as per bug #19532, while avoiding a needless copy
on /tmp which could be potentially mounted with noexec as per
bug #10582.
 2017-10-06 15:00:52 +02:00
JerzyX Drozdz
89200ff28e rebase from 2017.7.2 2017-10-06 13:18:16 +02:00
Arthur Lutz
4ce20bb2f7 [log/sentry] avoid KeyError: 'SENTRY_PROJECT' 
if compute_scope is not present on transport registry, we can't
update options dictionnary with empty dsn_config dictionary

fix  #43949
 2017-10-06 13:10:34 +02:00
pierre.bellicini
6d36a9f9fa
Merge branch 'add-missing-param-lxc-proxmox-driver' of github.com:cavepopo/salt into add-missing-param-lxc-proxmox-driver 2017-10-06 10:34:17 +02:00
pierre.bellicini
08f59a0962
fix missing space after cores in lxc section 
modified:   salt/cloud/clouds/proxmox.py
 2017-10-06 10:33:53 +02:00
Pier
ac56945f58 Merge branch 'develop' into add-missing-param-lxc-proxmox-driver 2017-10-06 10:24:47 +02:00
John Kristensen
b7edddd215 Document key_text option in pkgrepo state 
The `key_text` option was added a while back but the documentation for
it was not included. It would be a good idea to have all options
documented properly.
 2017-10-06 12:22:50 +11:00
John Kristensen
0cf411671e Check the key_text option doesn't conflict with any other options 
There are checks for `key_url` and `keyid`/`keyserver`, so we should
probably also have a check for `key_text` as well.
 2017-10-06 12:20:18 +11:00
Erik Johnson
aa3309ef59
Move several functions from salt.utils to salt.utils.user 
These functions are as follows:

- salt.utils.get_user
- salt.utils.get_uid
- salt.utils.get_specific_user
- salt.utils.chugid
- salt.utils.chugid_and_umask
- salt.utils.get_default_group
- salt.utils.get_group_list
- salt.utils.get_group_dict
- salt.utils.get_gid_list
- salt.utils.get_gid
 2017-10-05 19:50:14 -05:00
Nicole Thomas
a8f1750323 Merge pull request #43939 from terminalmage/fix-typo 
Fix typo in log message
 2017-10-05 19:20:04 -04:00
garethgreenaway
bd9f5d73fb Merge branch 'develop' into unit-test-sdb 2017-10-05 16:12:48 -07:00
Nicole Thomas
ac23b5cfe7 Merge pull request #43859 from eyj/boto_lc 
Add missing delete_on_termination passthrough. Adapt docs.
 2017-10-05 19:11:16 -04:00
Corvin Mcpherson
fefd28d896 Add futureproofing to roster_defaults to support roster dictionary options 2017-10-05 19:04:05 -04:00
pierre.bellicini
d4d639189b fix missing space after cores in lxc section 2017-10-06 00:53:44 +02:00
pierre.bellicini
9b717bdd88 added cores,cpulimit and rootfs lxc params 2017-10-06 00:47:33 +02:00
twangboy
254dac7723
Fix unit.utils.test_utils for Windows 
Use os agnostic path seps
Mock sys.platform to not return win
 2017-10-05 16:47:32 -06:00
garethgreenaway
53509e8d46 Merge branch 'develop' into unit-test-sdb 2017-10-05 15:35:13 -07:00
nasenbaer13
3d7340b371 Merge branch 'develop' into boto_lc 2017-10-05 22:42:56 +02:00
Nasenbaer
7d66ab9ac1 Merge remote-tracking branch 'origin/boto_lc' into boto_lc 2017-10-05 22:42:39 +02:00
Nasenbaer
7d3ece7a32 Adapted documentation of delete_on_termination parameter 2017-10-05 22:42:22 +02:00
Nicole Thomas
1a718eb1ed Merge pull request #43910 from terminalmage/issue43605 
Don't put unserializable dict.keys() into state return
 2017-10-05 16:33:46 -04:00
Nicole Thomas
31a641ce74 Merge branch 'develop' into panos-2017-9-26 2017-10-05 16:19:37 -04:00
Nicole Thomas
a7a59868c8 Merge pull request #43927 from rallytime/bp-43907 
Back-port #43907 to 2017.7
 2017-10-05 16:10:15 -04:00
Nicole Thomas
9ac3f2ea7b Merge pull request #43888 from rallytime/bp-43841 
Back-port #43841 to 2016.11
 2017-10-05 16:09:57 -04:00
Nicole Thomas
7785919437 Merge pull request #43829 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-05 16:09:23 -04:00
Nicole Thomas
4fcd4709ea Merge pull request #43934 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-05 16:07:35 -04:00
garethgreenaway
4c5af8cc96 Merge branch 'develop' into unit-test-sdb 2017-10-05 13:01:01 -07:00
Erik Johnson
29d8cf4f26
Fix typo in log message 
``UNCH`` should have been ``UNC``.
 2017-10-05 14:54:04 -05:00
Nicole Thomas
7d174172a0 Merge pull request #43886 from techhat/azuredict 
Fix object_to_dict in azure
 2017-10-05 15:33:55 -04:00
Nicole Thomas
e1b470061d Merge branch 'develop' into fix_id_cache 2017-10-05 15:06:30 -04:00
Nicole Thomas
49202d71e2 Merge pull request #43911 from eradman/vsphere_tests 
Skip some vsphere tests if pyvmomi library is not installed
 2017-10-05 14:58:31 -04:00
Nicole Thomas
f880ac4c08 Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway 
Fix typo in salt-cloud scaleway documentation
 2017-10-05 14:57:59 -04:00
Nicole Thomas
4a942b75e9 Merge pull request #43878 from netzmacher/develop 
Bugfix: runners/survey.py Python3 support
 2017-10-05 14:52:09 -04:00
garethgreenaway
9a0773542d Merge branch 'develop' into unit-test-sdb 2017-10-05 10:30:37 -07:00
garethgreenaway
37d7f13926 Merge branch 'develop' into vagrant-module 2017-10-05 10:25:24 -07:00
Bike Dude
7f004adca1
survey runner bugfix 2017-10-05 19:02:55 +02:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/modules/test_state.py
 2017-10-05 12:09:40 -04:00
Joseph Hall
4a77560646
Don't try to modify dict while looping through it 2017-10-05 09:51:38 -06:00
Richard Simko
f62e8ca87f
Make sure volume exists before querying 2017-10-05 09:09:40 -04:00
Nicole Thomas
865bf0fa9b Merge pull request #43907 from richardsimko/develop 
Make sure EBS volume exists before querying
 2017-10-05 08:59:11 -04:00
Nicole Thomas
b25df9106b Merge pull request #43894 from techhat/azurerg 
Show all nodes if no resource_group specified
 2017-10-05 08:56:11 -04:00