valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,069 Commits 24 Branches 182 Tags 341 MiB
044e0b2063
Commit Graph

81069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erik Johnson
e03698fbeb Add git_pillar integration tests 
This also adds a new section to the runtests.py so that ext_pillar
integration tests can be run separately.
 2017-04-20 03:51:08 -05:00
Erik Johnson
7cef07b0d9 Remove legacy git_pillar tests 
Also remove git_pillar configuration from the test suite's master
configuration file.
 2017-04-20 03:51:08 -05:00
Mike Place
c80c792704 remove too many newlines for lint 2017-04-19 15:42:57 -06: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
rallytime
85dc4164f5 Don't change the salt.utils.jinja yaml Dumper class 
This is already handled in the yaml template class.
 2017-04-19 11:58:31 -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
Nathan Fish
a7d8f375e8 file.manage_file: uppercase checksums now work 
fixes #38914
 2017-04-18 18:10:31 -04:00
rallytime
4fe6ac93c6 Add extra line for lint 2017-04-18 15:02:29 -06:00
CEG
4a70b8c0cc fixing minor error in security_groups 
security groups parser had incorrect split action which caused errors
 2017-04-18 15:00:35 -06:00
CEG
c9d6f8e5ed adding note in documentation 2017-04-18 14:47:29 -06:00
CEG
c24dfe3fba adding support for cacert verification 2017-04-18 14:13:11 -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
Enquier
bfaf5e322d Merge pull request #5 from saltstack/2016.11 
2016.11
 2017-04-18 13:54:23 -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
rallytime
55cfa12975 Use salt.utils.yamldumper with SafeOderedDumper as the Dumper in yaml.dump 2017-04-18 13:41:50 -06:00
rallytime
62c4d37c2f Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load 2017-04-18 13:41:07 -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
Clint Armstrong
72bf5af9e6 Set sfn if cached_sum == source_sum 2017-04-18 10:54:48 -04: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
rallytime
b35bf919a3 Handle stacktraces in cloud.action function in module and runner 
Refs #29602
 2017-04-17 15:58:30 -06:00
Nicole Thomas
a48ecc4a5c Merge pull request #40728 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-17 15:13:15 -06:00
Nicole Thomas
894dc96db3 Merge pull request #40727 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-17 15:12:47 -06:00
rallytime
ef09971b9e Change file data to bytes before attempting to hash 2017-04-17 15:01:51 -06:00
twangboy
e4876abcde Add back the two loader tests 2017-04-17 14:04:20 -06:00
Mike Place
f4f3ee69ba Merge pull request #40721 from gtmanfred/2016.3 
unset the bitwise instead of toggle
 2017-04-17 13:50:42 -06:00
rallytime
0a5e05a6e5 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-17 13:34:39 -06:00