Commit Graph

70849 Commits

Author SHA1 Message Date
Mike Place
bbb1b29ccb Merge pull request #42954 from Ch3LL/latest_2016.3
[2016.3] Bump latest and previous versions
2017-08-15 11:22:42 -06:00
Ch3LL
b551e66744 [2016.3] Bump latest and previous versions 2017-08-15 12:53:16 -04:00
Mike Place
5d5edc54b7 Merge pull request #42949 from Ch3LL/2016.3.7_docs
Add Security Notice to 2016.3.7 Release Notes
2017-08-15 10:49:12 -06:00
Ch3LL
d75d3741f8 Add Security Notice to 2016.3.7 Release Notes 2017-08-15 12:33:27 -04:00
Nicole Thomas
e9b0f20f8a Merge pull request #42359 from Ch3LL/doc-update-2016.3
[2016.3] Update version numbers in doc config for 2017.7.0 release
2017-07-18 13:23:35 -06:00
Ch3LL
dc85b5edbe [2016.3] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:50:54 -04:00
Nicole Thomas
8fa1fa5bb1 Merge pull request #42155 from phsteve/doc-fix-puppet
Fix docs for puppet.plugin_sync
2017-07-05 19:58:02 -06:00
Steve Katz
fb2cb78a31 Fix docs for puppet.plugin_sync so code-block renders properly and sync is spelled consistently 2017-07-05 19:56:11 -04:00
Nicole Thomas
c589eae03f Merge pull request #41981 from Ch3LL/11.6_3
[2016.3] Bump latest release version to 2016.11.6
2017-06-28 09:34:48 -06:00
Ch3LL
2516ae1349 [2016.3] Bump latest release version to 2016.11.6 2017-06-28 11:24:57 -04:00
garethgreenaway
c5a79a1ea6 Merge pull request #41695 from xiaoanyunfei/fixRecursion
fix max RecursionError, Ellipsis
2017-06-14 09:57:05 -07: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
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
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
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
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
C. R. Oldham
687872a488 Lint 2017-06-08 13:54:15 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files.
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
2017-06-08 13:18:53 -06:00
C. R. Oldham
e44673cdae Add caching of key. 2017-06-07 15:23:34 -06:00
C. R. Oldham
c3917d1e91 Fat finger fix. 2017-06-06 14:56:43 -06:00
C. R. Oldham
3b9326fda7 Sign_minion_messages support 2017-06-05 12:36:31 -06:00
Mike Place
964b1ee027 Merge pull request #41439 from terminalmage/salt-cp-base64
base64 encode binary data sent using salt-cp
2017-05-26 16:46:34 -05:00
Erik Johnson
ebf6cc78c7 base64 encode binary data sent using salt-cp
This fixes a problem when you make a request to salt-api using the /jobs
endpoint and request a JSON return. json.dumps() fails to serialize the
binary data entered into the job cache from salt-cp calls.
2017-05-25 18:08:33 -05:00
Mike Place
d617c9fe72 Merge pull request #41265 from terminalmage/issue41234
yumpkg: fix latest_version() when showdupesfromrepos=1 set in /etc/yum.conf
2017-05-19 13:49:58 -05:00
Erik Johnson
edf552fe9a Update PKG_TARGETS for RHEL-based distros 2017-05-18 11:15:06 -05:00
Mike Place
26bd914580 Merge pull request #41316 from Ch3LL/update_latest_2016.3
[2016.3] Bump latest release version to 2016.11.5
2017-05-18 10:33:43 -05:00
Ch3LL
520740d862
[2016.13] Bump latest release version to 2016.11.5 2017-05-18 09:40:08 -04:00
Mike Place
18898b7d1f Merge pull request #41216 from terminalmage/issue16592
Make salt-cp work with larger files
2017-05-17 14:26:41 -05:00
Erik Johnson
0ecc7b9b20 yumpkg: fix latest_version() when showdupesfromrepos=1 set in /etc/yum.conf
The existing logic assumes that showdupesfromrepos=0, in which a package
will not be shown if it is not an upgrade. This expands the version
check to include versions equal to the installed version, which will
keep the _check_cur() helper from incorrectly reporting that an
already-installed version is an upgrade.
2017-05-16 00:23:28 -05:00
Erik Johnson
0e15fdbb1a Update salt-cp integration test to reflect recent changes 2017-05-14 14:20:27 -05:00
Erik Johnson
10dc695cc4 Make salt-cp work with larger files
This breaks the files into chunks to keep them from exceeding the max size
of a published command. It also adds recursion, allowing for entire
directories to be transmitted. Finally, it adds gzip compression, and
a "-n" flag to disable use of compression.
2017-05-12 15:13:28 -05:00
Erik Johnson
c078180539 Make KeyErrors more specific when interpreting returns 2017-05-12 14:08:07 -05:00
Erik Johnson
fc401c9eb4 Add generator functions for reading files 2017-05-12 14:07:18 -05:00
Mike Place
2969153097 Merge pull request #41122 from terminalmage/masterless-env_cache-fix
gitfs: refresh env cache during update in masterless
2017-05-09 11:06:55 -06:00
Mike Place
b8f0a4f108 Merge pull request #41123 from terminalmage/gitfs-vsts-note
Add note on lack of support for VSTS in older libssh2 releases.
2017-05-09 10:49:47 -06:00
Erik Johnson
be732f0577 gitfs: refresh env cache during update in masterless
This fixes an edge case where an env blacklist/whitelist was updated
between masterless runs, or in later releases if an environment was
added via per-saltenv configuration. In these cases, if there are no
changes fetched, the env cache will remain intact, and will be returned
when envs() is called. This commit forces the env cache to be refreshed
on every update in masterless mode.

It also forces the env cache to be ignored when
salt.fileserver.Fileserver.envs() is executed in masterless mode (such
as via the fileserver.envs runner).
2017-05-09 10:12:45 -05:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Erik Johnson
8f79b6f537 Merge pull request #41090 from bbinet/rdurations_float
rdurations should be floats so that they can be summed when profiling
2017-05-06 01:18:40 -05:00
Erik Johnson
247400c44e Merge pull request #41083 from rallytime/git-state-fix
Git state: head_ref should be head_rev in "latest" function
2017-05-05 10:52:20 -05:00
Bruno Binet
fd48a63653 rdurations should be floats so that they can be summed when profiling 2017-05-05 12:04:34 +02:00
rallytime
b85ee48ff4 Git state: head_ref should be head_rev in "latest" function
The "head_ref" variable is not used anywhere in the code, and should
be "head_rev" instead. Without setting "head_rev" to "None", there is
a potential to hit an UnboundLocalError further down in the file.

This was caught by a test in the nitrogen branch, but the bug is present
on 2016.11 as well. Here's the output from the integration test failure:
```
   -> integration.states.test_git.GitTest.test_latest_updated_remote_rev  .........................................
       Traceback (most recent call last):
         File "/testing/tests/integration/states/test_git.py", line 365, in test_latest_updated_remote_rev
           self.assertSaltTrueReturn(ret)
         File "/testing/tests/support/mixins.py", line 547, in assertSaltTrueReturn
           **(next(six.itervalues(ret)))
       AssertionError: False is not True. Salt Comment:
       An exception occurred in this state: Traceback (most recent call last):
         File "/testing/salt/state.py", line 1822, in call
           **cdata['kwargs'])
         File "/testing/salt/loader.py", line 1727, in wrapper
           return f(*args, **kwargs)
         File "/testing/salt/states/git.py", line 727, in latest
           if head_rev is not None:
       UnboundLocalError: local variable 'head_rev' referenced before assignment
```
2017-05-04 14:39:15 -06:00
Mike Place
69418092bd Merge pull request #41070 from rallytime/lint-2016.3
Pylint: remove extra line in mac_system module
2017-05-04 11:09:34 -06:00
rallytime
486e2ba62e Pylint: remove extra line in mac_system module 2017-05-04 10:04:38 -06:00
Mike Place
3101694d71 Merge pull request #41048 from willkil/mac_system_non_root
mac_system: return False for non-root user
2017-05-04 09:38:29 -06:00
William Kilian
b65b82a750 mac_system: return False for non-root user
Fixes #40835.

Previously an exception was raised and salt repeatedly tried to load
the module. This spammed the console with error messages.
2017-05-03 14:36:10 -05:00