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
80,876 Commits 24 Branches 182 Tags 341 MiB
7efebc9f78
Commit Graph

80876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
7efebc9f78 Remove assertion against an empty string 
Returning an empty string is the expected behavior if the locale
is not set. This happens for example on the Fedora 24 test boxes.
 2017-04-24 12:19:06 -06:00
rallytime
e3550ab44c Skip gen_locale test if charmaps aren't available on the test machine 
The error of missing charmaps gets logged to the user. We shouldn't
be running the test for the gen_locale if we don't have charmaps
available on the test machine.
 2017-04-24 12:17:29 -06:00
rallytime
532cefe62e localemod.gen_locale add locale_search_str var to reduce confusion 
Add some spacing for easier readability
 2017-04-24 12:15:43 -06: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
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
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
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
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
Alex Powell
36f6521014 Merge remote-tracking branch 'upstream/2016.3' into s3-util-get-memory-fix 2017-04-20 13:23:14 +01:00
Alex Powell
04637cd4eb Fixing objects being loaded into memory when performing a GET request with a local file specified. 2017-04-20 13:22:29 +01:00
Alex Proca
91cafd5094 Add option to select 32 or 64 version of msiexec 
Pass path to msiexec overloading msiexec parameter
 2017-04-20 12:25:52 +03:00
Nicole Thomas
d8f78550d9 Merge pull request #40769 from rallytime/bp-40760 
Back-port #40760 to 2016.11
 2017-04-19 14:23:21 -06:00
rallytime
a8a327a732 Add deprecation messages to the trafficserver execution module 
This commit also includes a PY3 compatibility/pylint fix for the state module

The import for salt.utils was also fixed and all references in this state
were updated.
 2017-04-19 14:19:48 -06:00
rallytime
1af4d20cf0 Add deprecation message to trafficserver.set_var function 
The set_var function has a deprecation notice in the documentation
only for the trafficserver.set_var function, but no warning at the
CLI/logs. This PR adds a "warn_util" message.

Since there haven't been any warnings to the user about the removal
of this function, the version is being bumped from Oxygen to Fluorine
so users have time to adapt as needed.
 2017-04-19 12:54:47 -06:00
Jeffrey 'jf' Lim
71ac15fc4c Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! 2017-04-19 12:04:51 -06:00
Nicole Thomas
99048b1792 Merge pull request #40757 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-19 11:48:16 -06:00
Nicole Thomas
61f8de43df Merge pull request #40756 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-19 11:47:50 -06:00
twangboy
9a5671adf8 Fix _build_parent_list function for Py3 2017-04-19 10:36:31 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
rallytime
0e087323f1 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-18 16:41:22 -06:00
Mike Place
f4c9da2da0 Merge pull request #40733 from rallytime/fix-40435 
Change file data to bytes before attempting to hash
 2017-04-18 14:07:41 -06:00
Mike Place
3557b5140e Merge pull request #40735 from rallytime/handle-cloud-traces 
Handle stacktraces in cloud.action function in module and runner
 2017-04-18 14:05:06 -06:00
Mike Place
e700d8183b Merge pull request #40745 from cro/vmware_disk_datastore_bp 
Backport `Add support for specifying a datastore for new disks.` PR #36457
 2017-04-18 14:00:50 -06:00
Mike Place
78dbab01dc Merge pull request #40740 from cro/minion_delay_start 
Backport pr #39802 to add random_startup_delay
 2017-04-18 13:47:55 -06:00
C. R. Oldham
1460f82ce4 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:57:39 -06:00
C. R. Oldham
b26be652dd Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:56:09 -06:00
C. R. Oldham
096f063464 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:51:05 -06:00
Nicole Thomas
d0b90058c4 Merge pull request #40706 from twangboy/fix_whitelist 
Remove non-existent tests from whitelist
 2017-04-18 10:30:55 -06:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
C. R. Oldham
7608b10225 Add support for specifying a datastore for new disks. 2017-04-18 09:33:46 -06:00
Mike Place
2ab95b7dd5 Set minion test to use default opts 2017-04-18 08:34:57 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
Mike Place
8ab321f934 A random startup delay option for minions 
This allows minions to spread out the load to the master if a large number
of them start up at once.
 2017-04-18 08:34:56 -06:00
rallytime
87154a95a4 Use log.error instead of log.err 2017-04-17 16:29:03 -06:00