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
77,363 Commits 24 Branches 182 Tags 341 MiB
6e35673fe3
Commit Graph

77363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nicole Thomas
d68a6316b8 Merge pull request #41694 from rallytime/fix-40410 
Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs
 2017-06-12 13:06:15 -06:00
garethgreenaway
80d4a3ab98 Merge pull request #41659 from lubyou/41365-fix-file-managed 
Use re.escape to escape paths before handing them to re.match
 2017-06-12 11:10:52 -07:00
Erik Johnson
bdbb265a0b roots: return actual link destination when listing symlinks 
This fixes a regression in file.recurse, as the relative path on the
fileserver is usually not the actual link destination.
 2017-06-12 12:25:28 -05:00
rallytime
c91ca5f809 Remove note about version incompatibility with salt-cloud 
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
 2017-06-12 11:16:52 -06:00
Erik Johnson
faaacf88bf Use error name instead of error number 2017-06-12 11:09:10 -05:00
Mathieu Le Marec - Pasquet
7eacda5cbf Make print_cli resilient on slow systems 2017-06-12 11:08:01 -05:00
Erik Johnson
cdbfb94cfe Handle a few edge/corner cases with non-string input to cmd.run 
1. Handle non-string environment variables
2. Ensure that we pass a string to subprocess.Popen() when shell=True
3. Avoid traceback in state.single when a non-string ID dec is used

The third case above is not specific to cmd.run, it can happen with any
call to state.single in which the ID dec (i.e. the "name" argument) is
not a string. This is because state.single does not set the __sls__ key
in the chunk being called.
 2017-06-12 09:50:06 -05:00
rallytime
6de9da1d5d Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs 
Fixes #40410
 2017-06-11 21:38:45 -06:00
rallytime
569eb2bf7e Document available kwargs for ec2.create_volume function 
Fixes #40446
 2017-06-11 21:31:29 -06:00
Yann Jouanin
a47eddccd2 Fix #41688 : fix mkfs command linux-swap support 2017-06-11 12:00:16 +02:00
Nicole Thomas
564d5fd9d3 Merge pull request #41661 from whiteinge/rest_cherrypy-keys-headers 
Add note about avoiding the `-i` flag for the /keys endpoint
 2017-06-09 09:03:39 -06:00
Nicole Thomas
38424f3e3e Merge pull request #41660 from garethgreenaway/41651_fixing_aptpkg_held_unheld_with_test 
Fix to modules/aptpkg.py for unheld
 2017-06-09 08:53:22 -06:00
Nicole Thomas
a308b960d8 Merge pull request #41656 from rallytime/bp-41575 
Back-port #41575 to 2016.11
 2017-06-08 16:43:22 -06:00
Sergey Kizunov
154d6ce59e Don't invoke lspci if enable_lspci is False 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-06-08 17:05:04 -05:00
Nicole Thomas
4374e6b034 Replace "tbd" with release version information 2017-06-08 15:43:33 -06:00
Seth House
a66ffc9d3e Add note about avoiding the -i flag for the /keys endpoint 2017-06-08 13:56:01 -06:00
rallytime
81413896d1 Lint: Add index numbers to format {} calls 2017-06-08 12:32:00 -06:00
Gareth J. Greenaway
30da2370a4 Fix when test=True and packages were being set to unheld. 2017-06-08 11:21:35 -07:00
Mike Place
e6d37b5f3e Merge pull request #41456 from bdrung/fix-pkgrepo.managed-changes-check 
Fix pkgrepo.managed always return changes for test=true
 2017-06-08 13:21:04 -05:00
Mike Place
721e5b6cb9 Merge pull request #41530 from gtmanfred/2016.11 
Set default for consul_pillar to None
 2017-06-08 13:13:14 -05:00
Mike Place
8926d1c731 Merge pull request #41638 from gtmanfred/cmdscript 
don't overwrite args if they are passed to the script
 2017-06-08 12:48:48 -05:00
Johannes Scholz
d49a1579b0 Use re.escape to escape paths, before handing them to re.match 2017-06-08 19:40:54 +02:00
Johannes Scholz
ac240facca use correct variable 2017-06-08 19:36:37 +02:00