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
84,999 Commits 24 Branches 182 Tags 341 MiB
874dd2245a
Commit Graph

84999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Place
01d172a3f7 Merge pull request #42317 from garethgreenaway/fixing_beacons 
Refactoring Beacons
 2017-08-15 13:33:26 -06:00
Mike Place
eaaada5550 Merge pull request #42072 from onlyanegg/datadog-events_api 
Datadog events api
 2017-08-15 13:25:09 -06:00
Mike Place
4f406602cf Merge branch 'develop' into ldap_fix 2017-08-15 12:36:47 -06: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
Mike Place
b85c32daff Merge pull request #42067 from vitaliyf/softlayer-dont-split-hostname 
Removed several uses of name.split('.')[0] in SoftLayer driver.
 2017-08-15 12:22:40 -06:00
Gilbert Gilb's
18753597f7 Remove superfluous KeyError handling. 2017-08-15 20:15:04 +02: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
Erik Johnson
6be473fd9f Fix missed reference to salt.utils.compare_versions 2017-08-15 12:53:57 -05:00
Erik Johnson
338e5713cf Guard raet import in try/except 
This avoids a traceback upon import of salt.utils.raetevent in the
manage runner, when raet is not installed.
 2017-08-15 12:53:57 -05:00
Erik Johnson
2b76029ded Move 4 functions from salt.utils to salt.utils.versions 
This moves the following functions from salt.utils to salt.utils.versions:

- warn_until
- kwargs_warn_until
- compare_versions (as salt.utils.versions.compare)
- version_cmp
 2017-08-15 12:53:57 -05: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
Nicole Thomas
13b8637d53 Merge pull request #42942 from Ch3LL/2016.3.6_follow_up 
[2016.3] Add clean_id function to salt.utils.verify.py
 2017-08-15 13:37:46 -04:00
Nicole Thomas
89cede9816 Merge pull request #42956 from Ch3LL/latest_develop 
[develop] Bump latest and previous versions
 2017-08-15 13:34:43 -04:00
Ch3LL
9c324d3d0c [develop] Bump latest and previous versions 2017-08-15 13:32:01 -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
Mike Place
bbb1b29ccb Merge pull request #42954 from Ch3LL/latest_2016.3 
[2016.3] Bump latest and previous versions
 2017-08-15 11:22:42 -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
Ch3LL
b551e66744 [2016.3] Bump latest and previous versions 2017-08-15 12:53:16 -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
Mike Place
5d5edc54b7 Merge pull request #42949 from Ch3LL/2016.3.7_docs 
Add Security Notice to 2016.3.7 Release Notes
 2017-08-15 10:49:12 -06:00
Ch3LL
1d8f827c58 Add Security Notice to 2017.7.1 Release Notes 2017-08-15 12:37:50 -04:00
Ch3LL
a6f902db40 Add Security Notice to 2016.11.77 Release Notes 2017-08-15 12:35:37 -04:00
Ch3LL
d75d3741f8 Add Security Notice to 2016.3.7 Release Notes 2017-08-15 12:33:27 -04:00
Ch3LL
7e0a20afca Add release notes for 2016.11.7 release 2017-08-15 12:26:35 -04:00
Ch3LL
63823f8c3e Add clean_id function to salt.utils.verify.py 2017-08-15 12:24:47 -04:00
Ch3LL
f281e1795f move additional minion config options to 2016.3.8 release notes 2017-08-15 12:16:32 -04:00
Ch3LL
168604ba6b remove merge conflict 2017-08-15 12:12:40 -04:00
Ch3LL
8a07d95212 update release notes with cve number 2017-08-15 12:11:01 -04:00
Ch3LL
149633fdca Add release notes for 2016.3.7 release 2017-08-15 12:10:25 -04:00
Mircea Ulinic
73f9135340 extension_modules should default to /proxy/extmods 
Additionally, append it to the append_minionid_config_dirs
list, so each proxy caches its extension modules separately.
 2017-08-15 16:09:05 +00:00
Ch3LL
7a4cddcd95 Add clean_id function to salt.utils.verify.py 2017-08-15 12:08:13 -04:00
Erik Johnson
9d8486a894 Add test for custom YAML loader with unicode literal strings 2017-08-15 11:06:20 -05:00
Ch3LL
dcd92042e3 remove extra doc 2017-08-15 12:05:54 -04:00
Erik Johnson
a0118bcece Remove bytestrings and use textwrap.dedent for readability 
PyYAML works with and without bytestrings on PY3, and Python 3 can read
all of the test data as regular strings, so bytestrings are unnecessary
here.

This also adds use of textwrap.dedent to make the YAML easier to read,
so it can be indented away from the far left side of the line.
 2017-08-15 11:05:48 -05:00
garethgreenaway
c220372965 Merge branch 'develop' into datadog-events_api 2017-08-15 09:02:04 -07:00
garethgreenaway
8b48341a36 Merge branch 'develop' into fixing_beacons 2017-08-15 09:00:09 -07:00
Ch3LL
693a504ef0 update release notes with cve number 2017-08-15 11:57:33 -04:00