valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,408 Commits 24 Branches 182 Tags 341 MiB
733a2279ca
Commit Graph

77408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
733a2279ca npm 5.0.0 added a second line after fsevents 
Remove that line from so we only get the json
 2017-06-15 14:00:31 -06:00
Mike Place
36cb223ab2 Merge pull request #41740 from terminalmage/zd1532 
Fix spurious error when glob/regex used in publisher_acl
 2017-06-15 10:14:56 -05:00
Mike Place
126a36747b Merge pull request #41749 from terminalmage/parse_targets 
Fix bug in pkg_resource.parse_targets when version passed
 2017-06-15 10:05:52 -05:00
Nicole Thomas
2c24012ded Merge pull request #41753 from rallytime/bp-41449 
Back-port #41449 to 2016.11
 2017-06-14 16:16:10 -06:00
Mike Place
e685858269 Merge pull request #41750 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-06-14 17:15:40 -05:00
Mike Place
36cc8f1e35 Merge pull request #41756 from Ch3LL/2016.11.6_release 
Add Change Log to 2016.11.6 Release Notes
 2017-06-14 15:57:07 -05:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
Sébastien Wains
fae41c2875 Adjusting SVN unit test 2017-06-14 13:40:50 -06:00
Sebastien
eac6b151eb Improved SVN output in test mode 2017-06-14 13:40:49 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
garethgreenaway
edcafc6a26 Merge pull request #41692 from rallytime/fix-40155 
Add boto and boto3 version dependencies to boto_vpc state docs
 2017-06-14 12:05:06 -07:00
Erik Johnson
698806fb09 No need to manually create pkg_params dict when name and version passed 
This was an incorrect fix, the fix should have been made in
pkg_resource.parse_targets. Now that it is fixed there, this is not
needed.
 2017-06-14 14:03:26 -05:00
Erik Johnson
bdaeb55a77 Merge pull request #40902 from lorengordon/pillar-get-merge-lists 
Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists
 2017-06-14 13:39:08 -05:00
garethgreenaway
203ec6730f Merge pull request #41723 from rallytime/libcloud-support 
Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0
 2017-06-14 10:13:38 -07:00
Erik Johnson
7484bcc6c6 parse_targets: include version in packed return data 2017-06-14 12:02:53 -05:00
garethgreenaway
c5a79a1ea6 Merge pull request #41695 from xiaoanyunfei/fixRecursion 
fix max RecursionError, Ellipsis
 2017-06-14 09:57:05 -07:00
Mike Place
62dbf5083c Merge pull request #41655 from Enquier/nova-cloud-set_ip_address 
Allow Nova cloud module to set a specific floating ip address
 2017-06-14 11:44:04 -05:00
Erik Johnson
e5f3d08751 Fix spurious error when glob/regex used in publisher_acl 
An error is logged if any of the publisher_acl targets is not present in
the available usernames (as derived using pwd.getpwall()). However, at
some point publisher_acl was expanded to support globs and regexes to
specify user names. When this was done, the code which checks the
publisher_acl entries against the available users was not updated. This
results in spurious errors in the log when this code tries to look for a
regex or glob expression in the list of available usernames.

However, there is no real reason for this check, as all it does is run
pwd.getpwnam() on the publisher_acl entry, and it does this only when
the entry is not in the list of available users. So there is no way for
this to do anything but raise a KeyError.

The if block which checks the entry against the list of available users
has therefore been removed.
 2017-06-14 11:34:21 -05:00
rallytime
1e9a06000b Bump version check down to 1.4.0 and use distutils.version lib 2017-06-14 09:30:22 -06:00
Nicole Thomas
82eab84883 Merge pull request #41731 from terminalmage/docs 
Clarify that archive_format is required pre-2016.11.0
 2017-06-14 09:05:20 -06:00
Erik Johnson
d3f4ea1a84 Clarify that archive_format is required pre-2016.11.0 
This makes it more clear that the archive_format can only be left off if
you are running 2016.11.0 or newer.
 2017-06-13 22:51:24 -05:00
Loren Gordon
6e35673fe3 Preserves order when removing duplicates 2017-06-13 17:45:08 -04:00
Loren Gordon
18eda7084c Updates list merge tests to check for sorted, unique lists 2017-06-13 17:45:08 -04:00
Loren Gordon
74bf91f99e Sorts the list when removing duplicates 2017-06-13 17:45:08 -04:00
Loren Gordon
26a4b1b17f Adds pillar.get param to control list merge/overwrite behavior 
Previously, `pillar.get` would always default list merge behavior
based on the value of the opt `pillar_merge_lists`. This isn't
always desirable, particularly when creating a dictionary of
default values in a state and merging those defaults with a pillar
key. Sometimes you want a list in pillar to overwrite the default.

This patch adds a param `deep_merge_lists` that allows a user to
specify whether lists within the returned dictionary should be
merged with or overwrite lists within the `default` dictionary.

If unspecified, the new param defaults to the prior behavior.
 2017-06-13 17:45:08 -04:00
Loren Gordon
ed04bae94c Removes duplicate values when merging lists 
Fixes #39918
 2017-06-13 17:44:53 -04:00
Mike Place
b6d27beac2 Merge pull request #41663 from skizunov/develop3 
Don't invoke lspci if enable_lspci is False
 2017-06-13 16:19:42 -05:00
Mike Place
4b43ba3366 Merge pull request #41585 from cro/sign_minion_messages 
Sign_minion_messages support
 2017-06-13 16:14:40 -05:00
rallytime
a30f654b04 Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0 
If apache-libcloud 2.0.0 is installed, the workaround outlined in issue #32743
no longer applies and should be avoided. However, we still need to support older
versions of apache-libcloud that need this work-around.

The minimum version required of apache-libcloud has been updated to 2.0.0 in pull
request #40837, which will released in Oxygen. #40837 has removed all of the
work-arounds needed for issue #32743 for 2.0.0. Until Oxygen is released, however,
we need to support both the work-around for older versions of apache-libcloud as
well as 2.0.0.
 2017-06-13 14:22:32 -06:00
Mike Place
46b8d5dc4b Merge pull request #41693 from rallytime/fix-40446 
Document available kwargs for ec2.create_volume function
 2017-06-13 14:51:10 -05:00
garethgreenaway
aab55d304a Merge pull request #41696 from terminalmage/issue41691 
Handle a few edge/corner cases with non-string input to cmd.run
 2017-06-13 11:48:56 -07:00
Nicole Thomas
97897d7a7a Merge pull request #41697 from terminalmage/pr-41545 
Resubmit #41545 against 2016.11 branch
 2017-06-13 10:10:37 -06:00
Nicole Thomas
09260d7c08 Merge pull request #41711 from rallytime/fix-40605 
Update deprecated version info in manage.bootstrap func for root_user
 2017-06-13 10:04:32 -06:00
Nicole Thomas
d563b3e345 Merge pull request #41658 from garethgreenaway/39668_schedule_runners_fire_events 
Fixes to the salt scheduler
 2017-06-13 10:00:57 -06:00
garethgreenaway
3c3b9343b7 Merge pull request #41706 from twangboy/batch_files 
Add missing batch files
 2017-06-13 08:32:53 -07:00
Erik Johnson
0623e40d33 Apparently some funcs are passing tuples to cmd.run_* 2017-06-13 10:13:43 -05:00
Nicole Thomas
1afc4adc5a Merge pull request #41710 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-06-13 09:11:37 -06:00
rallytime
903c2ffca5 Update deprecated version info in manage.bootstrap fucn for root_user 
The warnings are for this argument to be removed in Oxygen. The documentation
tag should match.

Fixes #40605
 2017-06-12 20:19:54 -06:00
rallytime
5150916556 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/parted.py
 2017-06-12 20:10:45 -06:00
Nicole Thomas
5d763b9b7f Merge pull request #41702 from gtmanfred/2016.11 
npm 5 and greater requires --force for cache clean
 2017-06-12 17:21:55 -06:00
Nicole Thomas
f6519e7f80 Merge pull request #41704 from rallytime/bp-41670 
Back-port #41670 to 2016.11
 2017-06-12 17:20:31 -06:00
Nicole Thomas
5058b0de1f Merge pull request #41707 from terminalmage/master-tops-docs 
Update version in master-tops docs
 2017-06-12 17:18:43 -06:00
Erik Johnson
6ec9dfb7f3 Update version in master-tops docs 
This paragraphs is referring to #37322, which was pushed to Oxygen.
 2017-06-12 17:20:09 -05:00
Nicole Thomas
1c1964d807 Merge pull request #41689 from yannj-fr/fix-41688 
Fix #41688 : fix mkfs command linux-swap support
 2017-06-12 16:09:50 -06:00
Nicole Thomas
0b89377dce Merge pull request #41700 from terminalmage/issue39939 
roots: return actual link destination when listing symlinks
 2017-06-12 16:07:03 -06:00
Daniel Wallace
8bd19fcc17 fix version number 2017-06-12 16:05:57 -06:00
twangboy
0d4be0220b Add batch files for master 2017-06-12 15:48:46 -06:00
Daniel Wallace
0fa380f75c npm 5 and greater requires --force for cache clean 
This is the error

```
npm ERR! As of npm@5, the npm cache self-heals from corruption issues and
data extracted from the cache is guaranteed to be valid. If you want to make
sure everything is consistent, use 'npm cache verify' instead.

npm ERR!
npm ERR! If you're sure you want to delete the entire cache, rerun this command
with --force.
```
 2017-06-12 14:48:43 -06:00
Yann Jouanin
8afc8792d1 fixes #41668 ntfs case problem in parted module 2017-06-12 14:40:41 -06:00
Erik Johnson
7cf47f9651 Merge pull request #41699 from rallytime/troubleshooting-doc-update 
Remove note about version incompatibility with salt-cloud
 2017-06-12 14:44:28 -05:00