valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,226 Commits 24 Branches 182 Tags 341 MiB
7ead1ed336
Commit Graph

75226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
7ead1ed336 Merge pull request #38205 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-12 11:13:18 -07:00
Nicole Thomas
669409d681 Merge pull request #38203 from rallytime/bp-38188 
Back-port #38188 to 2016.11
 2016-12-12 10:48:51 -07:00
rallytime
e31f97cf71 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-12 10:08:27 -07:00
Andreas Tsaridas
50d3200b12 removing not needed join 2016-12-12 09:21:37 -07:00
Andreas Tsaridas
7af708e1e7 fix for push_dir in different OS 2016-12-12 09:21:36 -07:00
Mike Place
70f7d22ad6 Merge pull request #38191 from terminalmage/issue38162 
Clarify the fact that git_pillar.update does not fast-forward
 2016-12-12 02:45:48 -07:00
Mike Place
28171cbfc5 Merge pull request #38194 from vutny/integration-test-requirements-doc 
Document the requirements for running ZeroMQ-based integration tests
 2016-12-12 02:42:11 -07:00
Denys Havrysh
e9f419ff64 Document the requirements for running ZeroMQ-based integration tests 2016-12-10 22:16:18 +02:00
Erik Johnson
1ae543a98a Clarify the fact that git_pillar.update does not fast-forward 2016-12-09 22:52:12 -06:00
Megan Wilhite
f7294dc85b add 2016.11.1 changelog to release notes (#38186) 2016-12-09 15:44:09 -07:00
Nicole Thomas
a4ef037ab1 Merge pull request #38185 from rallytime/bp-38181 
Back-port #38181 to 2016.3
 2016-12-09 15:27:44 -07:00
Nicole Thomas
23c039347e Merge pull request #38182 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-09 14:25:47 -07:00
Mike Place
8355adc535 Merge pull request #38158 from cachedout/issue_38094 
Fix type problem in grains.filter_by
 2016-12-09 14:24:40 -07:00
Mike Place
31a157d902 Merge pull request #38156 from terminalmage/fix-windows-refresh 
Remove rtag when windows minion refreshes early in state
 2016-12-09 14:15:01 -07:00
Mike Place
c638952684 Merge pull request #38183 from cro/fix_37891 
Fix bad set operations when setting up securitygroups in AWS.
 2016-12-09 14:12:10 -07:00
rallytime
609f814454 Reset socket default timeout to None (fixes daemons_tests failures) 
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
 2016-12-09 13:50:48 -07:00
Nicole Thomas
fc95045ba1 Reset socket default timeout to None (fixes daemons_tests failures) (#38181) 
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
 2016-12-09 13:49:44 -07:00
C. R. Oldham
0527d6f25e Fix bad set operations when setting up securitygroups in AWS. Fixes #37891. 2016-12-09 12:23:33 -07:00
Mike Place
7ccbedd2cc Merge pull request #38148 from whiteinge/no-ssh-async-client 
Remove ssh_async from NetapiClient clients; it is not implemented
 2016-12-09 11:49:41 -07:00
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
e8196e23c2
Lint, remove set literal 2016-12-09 11:37:44 -07:00
Mike Place
8d4e194400 Merge pull request #38160 from terminalmage/update-archive-docs 
Update information about xz-utils in archive state/module docs
 2016-12-09 11:34:03 -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
Erik Johnson
8e4ad3cff3 Update information about xz-utils in archive state/module docs 
This may confuse people who aren't aware of what xz-utils is, and
believe that they need some weird third-party application.
 2016-12-08 12:41:30 -06: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
Erik Johnson
258bd4c2aa Remove rtag when windows minion refreshes early in state 
Failure to remove the rtag if a pkg.refresh_db was performed in the
process of running _find_install_targets() caused it to still be present
in subsequent pkg state runs, resulting in the refresh being repeated.

This commit fixes that by removing the rtag after that early refresh on
Windows minions. It also adds a try/except to guard against a traceback
which could occur if the rtag were removed outside of salt, during the
state run.
 2016-12-08 10:55:27 -06:00
Denys Havrysh
cd0154ee93 Master config includes may contain errors and be safely skipped 2016-12-08 15:58:44 +02:00
Seth House
cb58cd4795 Remove ssh_async from NetapiClient clients; it is not implemented 2016-12-07 17:32:12 -07: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
Mike Place
9f4ebb3c18
Fix type problem in grains.filter_by 
Closes #38094
 2016-12-07 11:25: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