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
82,085 Commits 24 Branches 182 Tags 341 MiB
a3e9b5cdbe
Commit Graph

82085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
d67c1dfbf7 Remove references to salt master installation 2017-06-13 15:02:44 -06: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
2524218e25 Merge pull request #41718 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-13 12:11:25 -06: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
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-13 09:26:05 -06: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
rallytime
382130ced4 Comment out module.run deprecation warning 
At the request of @thatch45, this deprecation warning is being
removed.

@isbm - It appears this change might need some more work before the
deprecation warning is officially issued. @thatch45 can you comment
with some more details?
 2017-06-12 17:17:34 -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
Nicole Thomas
740e933028 Merge pull request #41703 from gtmanfred/nitrogen 
mark all mac power tests as flaky
 2017-06-12 16:03:15 -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
Nicole Thomas
600a3ec16e Merge pull request #41685 from terminalmage/py3-tests 
Update orphan finding code to handle differences in psutil on PY3
 2017-06-12 14:34:00 -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
Daniel Wallace
b202505923 mark all mac power tests as flaky 
After talking to @cro, all of the mac power modules became super flaky in
Sierra.  Because of this, I am marking all of the mac power tests with the
flaky decorator.
 2017-06-12 13:34:12 -06: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
C. R. Oldham
628f709c3c Correct test--caching requires files on disk but the test just supplies 
what would have been read from disk.
 2017-06-12 12:55:14 -06:00
Nicole Thomas
435d6189bf Merge pull request #41446 from cloudflare/proxy-file 
[backport] salt-proxy:  Fix systemd unit file to handle more proxy names
 2017-06-12 12:33:20 -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
twangboy
e8a24db927 Remove win_unicode_console dependency 2017-06-12 11:56:18 -06: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
rallytime
67f0c17da3 Add flaky decorator to test_badload in tcp unit tests 2017-06-12 11:10:22 -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
xiaofei.sun
c54fde69a0 fix spell error 2017-06-12 17:58:36 +08:00
xiaofei.sun
bc855b4711 fix swallow exception 2017-06-12 17:34:49 +08: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
rallytime
539c1b0692 Add boto and boto3 version dependencies to boto_vpc state docs 
Also update __virtual__() to provide a more helpful error message if
the dependencies are not met and the boto_vpc execution module cannot
be loaded.

Fixes #40155
 2017-06-11 21:05:49 -06:00
Nicole Thomas
f41919ea09 Merge pull request #41686 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-11 20:43:09 -06:00
Yann Jouanin
a47eddccd2 Fix #41688 : fix mkfs command linux-swap support 2017-06-11 12:00:16 +02:00
xiaofei.sun
c0b1f57fc0 add exception 2017-06-11 09:38:59 +08:00
xiaofei.sun
aacf9f0a44 fix maximum recursion depth exceeded 2017-06-11 08:59:41 +08:00
rallytime
446ecdad63 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-09 15:16:16 -06:00