Commit Graph

77322 Commits

Author SHA1 Message Date
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
Mike Place
c649725e9b Merge pull request #41124 from gtmanfred/do
add user_data to digitalocean
2017-05-09 10:47:41 -06:00
Mike Place
d0a3fcf33a Merge pull request #41127 from xetus-oss/fix-41125-service-running
Fix incorrect service.running state response when enable=None and init script returns 0
2017-05-09 10:43:34 -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
Mike Place
a10f0146a4 Merge pull request #41134 from twangboy/fix_get_msiexec
Fix `pkg.install` on Windows on 2016.11
2017-05-09 09:10:18 -06:00
Bo Maryniuk
f3b12a3f5b Do not use multiple variables in "with" statement as of lint issues 2017-05-09 10:17:49 +02:00
twangboy
d808a60129 Remove redundant if statement 2017-05-08 16:02:04 -06:00
twangboy
b4d6d5a927 Fix for version_num of None and Latest 2017-05-08 15:59:36 -06:00
twangboy
0f31822a83 Fix problem when use_msiexec is a bool 2017-05-08 14:01:01 -06:00
Mike Place
4ecab68bb9 Merge pull request #41102 from gtmanfred/2016.11
don't pass jid to list_jobs
2017-05-08 11:45:39 -06:00
Daniel Wallace
2370d9316b add user_data to digital ocean 2017-05-08 09:59:27 -06:00
Theophile Meneau
d8766562c9 fix incorrect service.running success response
when enable=None and init script returns 0,
but service failed to start.

Fixes #41125
2017-05-08 10:25:21 -04:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Bo Maryniuk
35a8d99934 Disable the test for a while 2017-05-08 13:49:54 +02:00
Bo Maryniuk
76cb1b7150 Rewrite test case for using no patch decorators 2017-05-08 10:41:50 +02:00
C. R. Oldham
106394c80c Lint. 2017-05-06 20:51:33 -06:00
Erik Johnson
ffe4bc3d5c update unit test to reflect new behavior 2017-05-06 01:29:49 -05:00
Erik Johnson
482a5e341d Merge branch 'L4rS6-fix-file-blockreplace-diff-in-test-mode' into 2016.11 2017-05-06 01:29:46 -05:00
Erik Johnson
505cb45722 Merge branch 'fix-file-blockreplace-diff-in-test-mode' of https://github.com/L4rS6/salt into L4rS6-fix-file-blockreplace-diff-in-test-mode 2017-05-06 01:29:18 -05:00
Erik Johnson
2af89beb53 Merge pull request #41103 from lorengordon/win.get_route
Adds a get_route() function to win_network.py
2017-05-06 01:19:41 -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
92011dbe5f Fix "latest" keyword for version specification when used with aggregation
The "latest" keyword was only implemented when both "name" and "version"
were used, and not for "pkgs". But mod_aggregate puts all packages into
a single low chunk, within "pkgs". This means that using aggregation in
conjuntion with the "latest" keyword no longer resolves the latest
version and thus breaks these states.

This fixes the problem by moving the logic for resolving the "latest"
keyword into _find_install_targets(). It also makes some improvements to
the logic we use to ensure only one package DB refresh is performed per
Salt run, by making the pkg.refresh_db functions handle removing the
rtag file, instead of requiring a call to a helper function everywhere
in the pkg state where we might be calling a function that refreshes the
package DB.
2017-05-06 00:46:06 -05:00
C. R. Oldham
3be90cc9f4 Rescue proxy_auto_tests PR from git rebase hell 2017-05-05 17:04:00 -06:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
98ce829729 Support ssl_verify in pygit2 2017-05-05 16:58:13 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
Loren Gordon
93ce5644ea Adds test for win_network.get_route 2017-05-05 17:32:50 -04:00
Daniel Wallace
83057d0f0f don't pass jid to list_jobs 2017-05-05 14:32:08 -06:00
Loren Gordon
b9cbbc0290 Adds a get_route() function to win_network.py
Returns the same data as the get_route() function in the network.py
execution module.
2017-05-05 16:19:11 -04:00
Nicole Thomas
2f9b5a4074 Merge pull request #41098 from rallytime/bp-41088
Back-port #41088 to 2016.11
2017-05-05 13:04:02 -06:00
Nicole Thomas
2123001f32 Merge pull request #41097 from rallytime/bp-41079
Back-port #41079 to 2016.11
2017-05-05 13:03:42 -06:00
Nicole Thomas
ff6fa2b120 Merge pull request #41093 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-05 11:22:08 -06:00
Super-User
dc6cd2ea45 Fix docs for zfs state module 2017-05-05 10:59:12 -06:00
Brad Davis
845b49c304 Remove and extra colon that is causing rendering issues 2017-05-05 10:57:38 -06:00
rallytime
a670eaa1db Merge branch '2016.3' into '2016.11'
No conflicts.
2017-05-05 10:08:04 -06: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
C. R. Oldham
a4f7aa145e Look for libcrypto in both /opt/tools and /opt/local on Illumos-based distros. 2017-05-05 09:04:35 -06:00
Bruno Binet
fd48a63653 rdurations should be floats so that they can be summed when profiling 2017-05-05 12:04:34 +02:00
Nicole Thomas
4c2e636cd1 Merge pull request #41084 from rallytime/disable-matcher-test-arch
Skip the test_salt_documentation_arguments_not_assumed test for Arch
2017-05-04 15:56:28 -06:00
rallytime
da811fe505 Skip the correct test for the matcher tests in Arch
I mixed up the test that was actually failing for Arch. I originally
submitted #41074 to skip the test_salt_documentation test in the
shell matcher tests. This is the wrong test to skip.

I reverted the previous commit, and applied the skipTest to the
correct test that is failing on Arch, which is the
test_salt_documentation_arguments_not_assumed test.
2017-05-04 14:45:58 -06:00
rallytime
b9d1ce9aed Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch"
This reverts commit 9eb482d5c7.
2017-05-04 14:45:38 -06: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
1179720327 Merge pull request #41069 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-04 14:34:57 -06:00
Nicole Thomas
9d638abc62 Merge pull request #41074 from rallytime/disable-matcher-test-arch
Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch
2017-05-04 13:26:16 -06:00
Nicole Thomas
72c854d9ac Merge pull request #41078 from Ch3LL/add_2016.11.5_release
Add 2016.11.5 release notes and change log
2017-05-04 13:00:57 -06:00
Ch3LL
96ed815687
Add 2016.11.5 release notes and change log 2017-05-04 14:16:18 -04:00
rallytime
08c58919cb Merge branch '2016.3' into '2016.11'
No conflicts.
2017-05-04 11:43:40 -06:00
rallytime
9eb482d5c7 Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch
This test is failing in Arch due to a bug in salt-testing. Skipping until
salt-testing can be upgraded. For more information, see
https://github.com/saltstack/salt-jenkins/issues/324.
2017-05-04 11:26:01 -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
Mike Place
eac8401e90 Merge pull request #40879 from peter-funktionIT/2016.11
Update win_pki.py
2017-05-04 10:11:59 -06:00