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
83,004 Commits 24 Branches 182 Tags 341 MiB
d15b0ca937
Commit Graph

83004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
d15b0ca937 Merge pull request #43035 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.1 to 2017.7
 2017-08-18 08:58:16 -04:00
garethgreenaway
bcbb973a71 Merge pull request #43034 from rallytime/bp-43002 
Back-port #43002 to 2017.7
 2017-08-17 16:18:15 -07:00
garethgreenaway
9182f55bbb Merge pull request #42958 from gtmanfred/2017.7 
runit module should also be loaded as runit
 2017-08-17 15:30:22 -07:00
garethgreenaway
5985cc4e8e Merge pull request #43031 from gtmanfred/test_gem 
use a ruby gem that doesn't have dependencies
 2017-08-17 15:26:24 -07:00
garethgreenaway
246176b1a6 Merge pull request #43030 from rallytime/dockermod-minor-change 
Small cleanup to dockermod.save
 2017-08-17 15:25:59 -07:00
rallytime
756128a896 Merge branch '2017.7.1' into '2017.7' 
No conflicts.
 2017-08-17 16:52:06 -04:00
Maximilien Cuony
350c0767dc Try to fix #42989 by doing sslVerify and refspecs for origin remote only if there is no remotes 2017-08-17 16:45:47 -04:00
rallytime
d6a5e85632 Small cleanup to dockermod.save 
Removes the call to get ``compression`` out of the kwargs dict as
``compression`` is already listed in the list of positional kwargs.
 2017-08-17 16:30:46 -04:00
Daniel Wallace
ba80a7d4b5 use a ruby gem that doesn't have dependencies 2017-08-17 13:45:10 -06:00
Nicole Thomas
160001120b Merge pull request #42993 from pabloh007/fix-docker-save-push 
Fixes ignored push flag for docker.push module issue #42992
 2017-08-17 14:50:36 -04:00
garethgreenaway
9009a971b1 Merge pull request #42967 from terminalmage/issue42941 
Fix bug in on_header callback when no Content-Type is found in headers
 2017-08-17 11:48:52 -07:00
Nicole Thomas
58f070d7a7 Merge pull request #43016 from gtmanfred/service 
service should return false on exception
 2017-08-17 14:08:04 -04:00
garethgreenaway
973d288eca Merge pull request #43020 from gtmanfred/test_gem 
test with gem that appears to be abandoned
 2017-08-17 09:40:40 -07:00
Daniel Wallace
0a1f40a664 test with gem that appears to be abandoned 2017-08-17 10:38:32 -06:00
Mike Place
9cd0607fd4 Merge pull request #42999 from garethgreenaway/slack_engine_allow_editing_messages 
Fixes to slack engine
 2017-08-17 09:46:23 -06:00
Mike Place
31627a9163 Merge pull request #43010 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-17 09:10:28 -06:00
Daniel Wallace
21c264fe55 service should return false on exception 2017-08-17 08:56:12 -06:00
rallytime
8a0f948e4a Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/versions.py
  - tests/unit/modules/test_boto_elb.py
  - tests/unit/modules/test_boto_secgroup.py
  - tests/unit/states/test_boto_vpc.py
 2017-08-17 09:10:31 -04:00
Gareth J. Greenaway
0ece2a8f0c Fixing a bug that prevented editing Slack messages and having the commands resent to the Slack engine. 2017-08-16 16:28:05 -07:00
garethgreenaway
82be9dceb6 Merge pull request #42884 from Giandom/2017.7.1-fix-slack-engine-pillar-args 
Convert to dict type the pillar string value passed from slack
 2017-08-16 15:30:43 -07:00
Pablo Hernandez
fe7554cfeb Fixes ignored push flag for docker.push module issue #42992 2017-08-16 15:56:49 -04:00
Nicole Thomas
42bd553b98 Merge pull request #42963 from twangboy/win_unit_test_fileclient 
Fix `unit.test_fileclient` for Windows
 2017-08-16 10:18:17 -04:00
Nicole Thomas
7dddeeea8d Merge pull request #42964 from twangboy/win_fix_recursive_copy 
Fix `salt.utils.recursive_copy` for Windows
 2017-08-16 10:17:26 -04:00
Nicole Thomas
1ee9499d28 Merge pull request #42968 from vutny/doc-salt-cloud-ref 
[DOCS] Fix link to Salt Cloud Feature Matrix
 2017-08-16 09:16:16 -04:00
Denys Havrysh
44ed53b1df [DOCS] Fix link to Salt Cloud Feature Matrix 2017-08-16 10:26:45 +03:00
Erik Johnson
b838460816 Fix bug in on_header callback when no Content-Type is found in headers 
01d6ee176d modified our header-parsing
callback to parse the headers for the encoding. However, this did not
take into account the cases in which there is a 30x redirect with no
Content-Type header. In these cases, we fail to reset the values we use
to track both a) the headers and b) whether or not we've parsed the HTTP
status code, leading to a ValueError when the HTTP status line is passed
to the callback after following the redirect.

This commit fixes this case by detecting the blank line at the end of
the HTTP headers, and if no Content-Type has been found, the tracking
values are reset so that we properly process the headers post-redirect.
 2017-08-15 22:18:53 -05:00
Mike Place
923f9741fe Merge pull request #42291 from vutny/fix-38839 
Fix #38839: remove `state` from Reactor runner kwags
 2017-08-15 17:01:08 -06:00
twangboy
121cd4ef81 Fix salt.utils.recursive_copy for Windows 
Use os.sep instead of hard-coded `/`
 2017-08-15 16:53:28 -06:00
twangboy
e9febe4893 Fix unit.test_fileclient 
Use os.sep instead of hard-coded, unix-style paths
 2017-08-15 16:34:03 -06:00
Mike Place
c20bc7d515 Merge pull request #42940 from gtmanfred/2016.11 
create new ip address before checking list of allocated ips
 2017-08-15 15:47:17 -06:00
Nicole Thomas
6da4d1d95e Merge pull request #42946 from cloudflare/px_extmods_42943 
extension_modules should default to $CACHE_DIR/proxy/extmods
 2017-08-15 17:26:35 -04:00
Nicole Thomas
d6496eca72 Merge pull request #42959 from rallytime/bp-42883 
Back-port #42883 to 2016.11
 2017-08-15 17:25:47 -04:00
Daniel Wallace
253e216a8d fix IP address spelling 2017-08-15 12:30:03 -06:00
rallytime
c6b9ca4b9e Lint fix: add missing space 2017-08-15 14:26:44 -04:00
rallytime
5597b1a30e Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-15 14:26:44 -04:00
rallytime
a0b19bdc27 Update account id value in boto_secgroup module unit test 
This value was updated in moto 1.0.0 with the following commit:

5f3fbff627
 2017-08-15 14:23:00 -04:00
rallytime
60b406e088 @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-15 14:23:00 -04:00
rallytime
6ae1111295 Replace @mock_ec2 calls with @mock_ec2_deprecated calls 
moto versions >= 1.0.0 have changed the way the mocked connections through
boto are handled with the @mock_ec2 decorator. They use the boto3 connection
method. However, since we are still using boto in many places, we need to use
the new @mock_ec2_deprecated decorator instead to handle the boto connection
functions for the unit tests.

Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should
be installing newer versions of moto for those tests. Unfortunately, we cannot
install an older version of moto for Python2 that use the original @mock_ec2 call
and also import the @mock_ec2_deprecated function for newer versions of moto
simultaneously as the @mock_ec2_deprecated function doesn't exist in older
versions of moto.
 2017-08-15 14:22:59 -04:00
Daniel Wallace
fd6874668b runit module should also be loaded as runit 
This will allow the use of both systemd and runit at the same time
 2017-08-15 12:09:57 -06:00
Nicole Thomas
6366e05d0d Merge pull request #42944 from Ch3LL/2016.11.6_follow_up 
[2016.11] Add clean_id function to salt.utils.verify.py
 2017-08-15 14:06:11 -04:00
Nicole Thomas
95645d49f9 Merge pull request #42945 from Ch3LL/2017.7.0_follow_up 
[2017.7] Add clean_id function to salt.utils.verify.py
 2017-08-15 14:04:19 -04:00
Nicole Thomas
ab1b099730 Merge pull request #42948 from Ch3LL/2017.7.0_follow_up 
[2017.7.1] Add clean_id function to salt.utils.verify.py
 2017-08-15 14:02:38 -04:00
Nicole Thomas
47ff9d5627 Merge pull request #42812 from terminalmage/yaml-loader-tests 
Update custom YAML loader tests to properly test unicode literals
 2017-08-15 13:50:22 -04:00
Mike Place
5d0c2198ac Merge pull request #42953 from Ch3LL/latest_2017.7 
[2017.7] Bump latest and previous versions
 2017-08-15 11:23:27 -06:00
Mike Place
49d339c976 Merge pull request #42952 from Ch3LL/latest_2016.11 
[2016.11] Bump latest and previous versions
 2017-08-15 11:23:02 -06:00
Ch3LL
cbecf65823 [2017.7] Bump latest and previous versions 2017-08-15 12:55:02 -04:00
Ch3LL
74e7055d54 [2016.11] Bump latest and previous versions 2017-08-15 12:54:12 -04:00
Mike Place
b0d2e05a79 Merge pull request #42950 from Ch3LL/2016.11.7_docs 
Add Security Notice to 2016.11.7 Release Notes
 2017-08-15 10:50:23 -06:00
Mike Place
730e71db17 Merge pull request #42951 from Ch3LL/2017.7.1_docs 
Add Security Notice to 2017.7.1 Release Notes
 2017-08-15 10:49:55 -06:00
Ch3LL
1d8f827c58 Add Security Notice to 2017.7.1 Release Notes 2017-08-15 12:37:50 -04:00