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
75,201 Commits 24 Branches 182 Tags 341 MiB
627242ab5d
Commit Graph

75201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
627242ab5d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - tests/unit/config/config_test.py
 2016-12-09 11:45:14 -07:00
Mike Place
65b2ad7b14 Merge pull request #38163 from Ch3LL/enabled_ec2_cloud 
enabled ec2 cloud tests
 2016-12-09 11:01:57 -07:00
Mike Place
05136f0d8c Merge pull request #38164 from techhat/azuredocs 
Add Azure ARM docs for 2016.11.0
 2016-12-09 11:00:22 -07:00
Mike Place
e3c858cc28 Merge pull request #38173 from rallytime/update-win-deprecation-versions 
Bump some win* module deprecations from Nitrogen to Oxygen
 2016-12-09 09:57:29 -07:00
Mike Place
b63f74e034 Merge pull request #38177 from vutny/fix-cp-get-file-str 
Correct `cp.get_file_str` docstring and add integration tests
 2016-12-09 09:55:35 -07:00
Denys Havrysh
a449980672 Correct cp.get_file_str docstring and add integration tests 2016-12-09 13:05:57 +02:00
rallytime
09a50b25e7 Bump some win* module deprecations from Nitrogen to Oxygen 
We should have at least 2 feature releases for deprecation
warnings before removal.
 2016-12-08 15:29:07 -07:00
Joseph Hall
71b787e250 Add Azure ARM docs for 2016.11.0 2016-12-08 12:43:18 -07:00
Ch3LL
be74c45463 enabled ec2 cloud tests 2016-12-08 12:39:42 -07:00
Mike Place
827bf59999 Merge pull request #38036 from terminalmage/archive-extracted-override 
archive.extracted: fix problems with overwrite arg
 2016-12-08 12:08:40 -07:00
Mike Place
50773a5f96 Merge pull request #38133 from terminalmage/zd1067 
Fix edge case in creation of trans tar for salt-thin
 2016-12-08 10:47:25 -07:00
Mike Place
7596313be0 Merge pull request #38153 from vutny/master-includes-error-tolerance 
Master config includes may contain errors and be safely skipped
 2016-12-08 10:43:34 -07:00
Denys Havrysh
cd0154ee93 Master config includes may contain errors and be safely skipped 2016-12-08 15:58:44 +02:00
Nicole Thomas
6026cb23b2 Merge pull request #38138 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-07 13:15:56 -07:00
rallytime
28b56ea3b4 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-07 13:14:28 -07:00
Nicole Thomas
90478ef25e Merge pull request #38130 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-07 13:11:19 -07:00
Nicole Thomas
86091db647 Skip daemon unit tests when running on Python 2.6 (#38134) 
When switching the daemon unit tests to using multiprocessing pipes,
this exposed a deep bug in Python 2.6. Let's skip these on 2.6.
 2016-12-07 13:09:19 -07:00
Erik Johnson
71e0bd023f Fix edge case in creation of trans tar for salt-thin 
Using a simple ``str.find()`` on paths cached within the minion's
salt-thin cachedir causes problems when the dir being cached is found in
the minion ID itself.

For example, assume that the master is prepping a salt-ssh state package
for a minion named ``foo.bar.baz``, and one of the paths being cached is
``salt://foo``. As we iterate over the cached paths to write them to the
trans tar, ``salt://foo/bar.sh`` would have been cached to a path like
``/var/cache/salt/master/salt-ssh/foo.bar.baz/files/base/foo/baz.sh``,
and our str.find() would find the first ``foo`` in the minion ID instead
of where we want (after the saltenv ``base``).

This commit resolves this issue by ditching ``str.find()`` in favor of
deriving the actual path we are looking for, so that when we use a
string slice we are removing everything but the ``salt://`` fileserver
path (which is what we want).

It also makes the minion ID a required parameter, as A) we pass it
everywhere we invoke ``prep_trans_tar()``, and B) not passing it would
set its value to ``None``, resulting in an AttributeError when we try to
join a ``None`` to the cachedir.
 2016-12-07 12:20:39 -06:00
Megan Wilhite
1a42e24e72 Fix beacon index (#38129) 
* add new beacon modules to index

* add salt.beacons.avahi_announce to index and release notes
 2016-12-07 10:44:53 -07:00
Nicole Thomas
bbdfcab7d9 Add versionadded tags for network module funcs (#38127) 2016-12-07 10:44:25 -07:00
Mike Place
fd06bab673 Merge pull request #38043 from MTecknology/2016.11 
Debian networking fix
 2016-12-07 10:32:17 -07:00
Thomas S Hatch
4b9a7f2295 Merge pull request #38107 from cachedout/supercede_38088 
Status beacon should raise proper exception
 2016-12-07 10:21:49 -07:00
Mike Place
73d724845d Change to log.debug per Tom 2016-12-07 10:21:21 -07:00
rallytime
4d7d9abb41 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-07 09:43:08 -07:00
Mike Place
da8f5ac0c6 Merge pull request #38101 from lorengordon/file-replace-note 
Clarifies file.replace behavior on symlinks
 2016-12-07 06:27:11 -07:00
Mike Place
d3d98fd4eb Merge pull request #38102 from rallytime/fix-38091 
Add False + msg tuple return if requests is missing for zenoss module
 2016-12-07 06:24:37 -07:00
Mike Place
8c8cbc2734 Merge pull request #38104 from rallytime/bp-36794 
Back-port #36794 to 2016.3
 2016-12-07 06:23:48 -07:00
Mike Place
da135b1b59 Fix docs 2016-12-07 06:21:02 -07:00
Mike Place
d47761f349 Merge pull request #38113 from terminalmage/issue38090 
Revert changes to refresh tag for pkg states
 2016-12-07 06:11:14 -07:00
Mike Place
d4c34e0a58 Merge pull request #38120 from Da-Juan/2016.11 
Fix status beacon config default values
 2016-12-07 06:08:33 -07:00
Mike Place
6868089a87 Merge pull request #38114 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-07 05:45:04 -07:00
Mike Place
b9920e54ee Merge pull request #38109 from gtmanfred/2016.11 
mode needs to be an integer
 2016-12-07 04:58:23 -07:00
Da-Juan
7e4a35e8ad Fix status beacon config default values 
Config values are expected as lists not strings.
This fixes saltstack/salt#37976
 2016-12-07 12:55:35 +01:00
rallytime
fec9dec23a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/daemons_test.py
  - tests/unit/states/file_test.py
 2016-12-06 16:23:51 -07:00
rallytime
c906c8a0d5 Pylint fixes 2016-12-06 16:18:25 -07:00
Nicole Thomas
fd77dcbd0f Merge pull request #38103 from rallytime/bp-37283 
Back-port #37283 to 2016.11
 2016-12-06 16:12:59 -07:00
Nicole Thomas
5d9d6b9280 Merge pull request #38057 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-06 16:11:41 -07:00
Nicole Thomas
9969544653 Account for case where vim install already exists and is at an older version (#38112) 2016-12-06 16:07:56 -07:00
Erik Johnson
9f347df012 Revert changes to refresh tag for pkg states 
This reverts commit cd16f7f9bb.
 2016-12-06 16:28:38 -06:00
Nicole Thomas
792b422dc2 Pylint fix 2016-12-06 15:10:11 -07:00
rallytime
342884018b Fix SaltKeyOptionParserTestCase test failures 2016-12-06 15:03:44 -07:00
Daniel Wallace
7546760eb3 mode needs to be an integer 
It can't be 'Disabled'.  That cannot be written to
/sys/fs/selinux/enforce
 2016-12-06 14:47:41 -06:00
Mike Place
88e03bba6d
Fix typo 2016-12-06 11:27:47 -07:00
Mike Place
a8ce153252
Status beacon should raise proper exception 
Also have it check for the status exec module in __virtual__()
 2016-12-06 11:19:49 -07:00
Dominic Schlegel
da3ebf83e6 FreeBSD sysctl module now handels config_file parameter in show method 2016-12-06 09:55:26 -07:00
Jean Praloran
11944df69b handle up to version 1.9.0 2016-12-06 09:53:39 -07:00
rallytime
186e2d0d03 Don't allow libcloud mock module injection in unit/states/libcloud_dns_test.py either 2016-12-06 09:24:07 -07:00
rallytime
4f79d5a0d1 Add False + msg tuple return if requests is missing for zenoss module 
Fixes #38091
 2016-12-06 09:01:53 -07:00
Loren Gordon
345990f2b0 Clarifies file.replace behavior on symlinks 2016-12-06 10:58:09 -05:00
Mike Place
f8c67a9598 Merge pull request #38021 from mateiw/salt-ssh_master_tops 
Add master_tops support in salt-ssh
 2016-12-06 07:26:22 -07:00