valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,905 Commits 24 Branches 182 Tags 341 MiB
8e24b3a8b2
Commit Graph

80905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
8e24b3a8b2 Pylint fixes for some cloud unit tests 2017-04-25 11:06:39 -06:00
rallytime
7f14a6491e Rename nova and openstack unit tests to test_*.py 2017-04-25 09:27:11 -06:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
 2017-04-24 15:35:28 -06:00
Nicole Thomas
7861f12df8 Merge pull request #40855 from Ch3LL/11.4_release_2016.11 
[2016.11] Bump latest release version to 2016.11.4
 2017-04-24 11:37:46 -06:00
Ch3LL
e7b604339d
[2016.11] Bump latest release version to 2016.11.4 2017-04-24 13:29:28 -04:00
Mike Place
df85e9adcf Merge pull request #40772 from rallytime/trafficserver-deprecation-warning 
Add deprecation message to trafficserver.set_var function
 2017-04-23 04:32:31 -06:00
Mike Place
643407f689 Merge pull request #40834 from rallytime/locale-test-fixes 
Update os_family grain to be "Suse" instead of "SUSE" for localemod
 2017-04-23 04:11:17 -06:00
Mike Place
25b62aee47 Merge pull request #40817 from isbm/isbm-skip-false-values-from-preferred-ip-201611 
Some UT for cloud
 2017-04-23 04:01:40 -06:00
Bo Maryniuk
7c5714b90b Describe debug information 2017-04-22 10:45:21 +02:00
Bo Maryniuk
e0210ff8cb Reformat idents, fix typos 2017-04-22 10:45:08 +02:00
Bo Maryniuk
fb777e3f3e PEP8: fix unused variable 2017-04-22 10:44:20 +02:00
Bo Maryniuk
b2e85de85d Fix lint, typos and readability 2017-04-22 10:19:05 +02:00
Bo Maryniuk
116c96a4b7 Fix UT parameter changes 2017-04-22 10:08:20 +02:00
Bo Maryniuk
61558f08e7 Lintfix E0602 2017-04-22 10:08:20 +02:00
Bo Maryniuk
ed84420df0 Add unit test for node ip filtering 2017-04-22 10:08:20 +02:00
Bo Maryniuk
82582cff77 Skip test, if libcloud is not around 2017-04-22 10:08:20 +02:00
Bo Maryniuk
f005d53c56 Fix name error exception 2017-04-22 10:08:20 +02:00
Bo Maryniuk
b668e60b4c Move out nested function for testing purposes 2017-04-22 10:08:19 +02:00
Bo Maryniuk
5e574a24d9 Add unit test for nova connector 2017-04-22 10:08:19 +02:00
Bo Maryniuk
181d0780d0 Lintfix 2017-04-22 10:08:19 +02:00
Bo Maryniuk
8e9ce1a68d Move out nested function to be unit-testable 2017-04-22 10:08:19 +02:00
Bo Maryniuk
cd43805770 Add initial unit test for openstack cloud module 2017-04-22 10:08:19 +02:00
Bo Maryniuk
177f31446d Add fake preferred IP function for testing 2017-04-22 10:08:19 +02:00
Bo Maryniuk
d1aeb13ac7 Move out openstack's nested function to be testable 2017-04-22 10:03:46 +02:00
rallytime
3898117d6e Update os_family grain to be "Suse" instead of "SUSE" for localemod 
Also update some of the test functions to be a little more clear
 2017-04-21 16:14:50 -06:00
Nicole Thomas
50ddf219a6 Merge pull request #40824 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-21 14:03:10 -06:00
Mike Place
d6e26d18cb Merge pull request #40811 from UtahDave/2016.11local 
get config_dir based off conf_file if __opts__['config_dir'] doesn't exist
 2017-04-21 11:44:41 -06:00
Mike Place
ddedf05b7d Merge pull request #40820 from gtmanfred/2016.11 
remove deprecated firstgen rackspace cloud driver
 2017-04-21 11:42:18 -06:00
rallytime
f31f9512b8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-21 09:51:31 -06:00
Nicole Thomas
9e9d5ad0a9 Merge pull request #40810 from rallytime/fix-tls-test-failure 
Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict.
 2017-04-21 09:25:44 -06:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
David Boucha
9f6e2e9c92 get config_dir based off conf_file 
get config_dir based off conf_file if config_dir not in __opts__

ZD 1353
 2017-04-20 17:20:19 -06:00
Nicole Thomas
aba6e0bb2d Merge pull request #40807 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-20 17:05:40 -06:00
rallytime
d5b1241972 Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict 
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
 2017-04-20 17:02:33 -06:00
rallytime
615448a3f3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/utils/s3.py
 2017-04-20 13:47:02 -06:00
Nicole Thomas
2ab42489df Merge pull request #40797 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-20 13:42:03 -06:00
Nicole Thomas
ced839f841 Merge pull request #40800 from rallytime/bp-40720 
Back-port #40720 to 2016.11
 2017-04-20 13:41:40 -06:00
Nicole Thomas
4914486067 Merge pull request #40802 from rallytime/fix-pkgrepo-test-failure 
Update managed.sls test file: osmajorrelease grain is an int now
 2017-04-20 13:35:01 -06:00
Nicole Thomas
665678526d Merge pull request #40798 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-20 12:42:53 -06:00
rallytime
bad421be66 Update managed.sls test file: osmajorrelease grain is an int now 
We need to make the comparison in the file to `7` instead of `'7'`,
otherwise the state doesn't execute correctly and the test_pkgrepo
test will fail because the state didn't run.
 2017-04-20 12:27:45 -06:00
Ken Crowell
6c0124ae21 Call tornado.httputil.url_concat compatibly 
See https://github.com/tornadoweb/tornado/pull/1899.
 2017-04-20 11:37:20 -06:00
rallytime
0b96d52f71 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-04-20 11:21:10 -06:00
rallytime
22500a7261 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/utils/s3.py
 2017-04-20 11:18:43 -06:00
Mike Place
3b9ebeb98f Merge pull request #40754 from lordcirth/fix-uppercase-checksums 
file.manage_file: uppercase checksums now work
 2017-04-20 11:17:49 -06:00
Mike Place
68542f7aec Merge pull request #40768 from twangboy/fix_win_lgpo 
Fix _build_parent_list function for Py3
 2017-04-20 11:15:39 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection 
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
 2017-04-20 10:45:13 -06:00
Mike Place
623e2eb61f Merge pull request #40791 from a-powell/s3-util-get-memory-fix 
S3 util get memory fix
 2017-04-20 10:32:26 -06:00
Mike Place
f0f135c71d Merge pull request #40796 from terminalmage/fix-nodegroup-docs 
Fix inaccurate nodegroup docs
 2017-04-20 10:08:21 -06:00
Erik Johnson
f99259a6eb Fix inaccurate nodegroup docs 
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
 2017-04-20 10:07:19 -05:00