valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,189 Commits 24 Branches 182 Tags 341 MiB
16b4b9eb43
Commit Graph

81189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
16b4b9eb43 Make sure "version" exists before looking for pkg key 
Fixes the test failure happening on the SUSE Leap build in the nitrogen
branch.

Version can be an empty dictionary and pass the check, but then we hit
a key error on the next line. Let's avoid that.

This failure was caused by the changes in #41086.

Fixes https://github.com/saltstack/salt-jenkins/issues/332
 2017-05-05 16:29:56 -06:00
Nicole Thomas
1930616d89 Merge pull request #41094 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-05 13:03:06 -06:00
rallytime
31887bc735 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-05 11:23:15 -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
rallytime
bb1917243e Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-05 10:11:11 -06:00
rallytime
a670eaa1db Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-05 10:08:04 -06:00
Mike Place
127eb04ff6 Merge pull request #41082 from rallytime/fix-spm-unit-tests 
Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests
 2017-05-05 10:05:43 -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
Nicole Thomas
bae17ed4b9 Merge pull request #41085 from Ch3LL/fix_azure 
Fix azure tests to query provider
 2017-05-05 09:49:58 -06:00
Nicole Thomas
f4eaa8e44a Merge pull request #41086 from twangboy/fix_test_pkg 
Fix test pkg
 2017-05-05 09:49:16 -06:00
twangboy
cc3f2d0c31 Fix some indenting issues 2017-05-04 16:51:29 -06:00
twangboy
019dc5f966 Fix some logic in _get_msiexec 2017-05-04 16:49:20 -06:00
twangboy
e4c5156d77 Fix some lint 2017-05-04 16:45:58 -06: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
twangboy
20da5f5d4b Add software def for putty 2017-05-04 15:16:21 -06:00
twangboy
75072b1c83 Fix pkg tests for windows 2017-05-04 15:13:41 -06:00
Ch3LL
1eda73bd61
fix azure tests to query provider 2017-05-04 16:50:24 -04: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
rallytime
891e174f71 Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests 
Fixes the spm unit test failures in CentOS 6. These calls to the client need to be
patched so they don't interact with other unit tests.
 2017-05-04 14:30:49 -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
21574ea543 Merge pull request #41076 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-04 13:02:59 -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
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06: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
41c2628895 Merge pull request #41068 from rallytime/bp-41023 
Back-port #41023 to nitrogen
 2017-05-04 11:08:57 -06:00
Mike Place
0d10046098 Merge pull request #40967 from ezh/fabric-fix-2-ssh-client 
[40966] Fix ssh client TypeError
 2017-05-04 10:39:57 -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
Mike Place
39f5dc91cb Merge pull request #40909 from gtmanfred/nitrogen 
Define separate target for proxy minions
 2017-05-04 10:07:38 -06:00
rallytime
486e2ba62e Pylint: remove extra line in mac_system module 2017-05-04 10:04:38 -06:00
rallytime
db70b2d42e Pylint: remove extra line in mac_system module 2017-05-04 10:02:16 -06:00
rallytime
855d157aa6 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-04 09:59:02 -06:00
Mike Place
547a9738db Merge pull request #41036 from terminalmage/issue40928 
Do not force effective saltenv when running states via orchestration
 2017-05-04 09:44:13 -06:00
Mike Place
6e2458e171 Merge pull request #41039 from terminalmage/improve-pip-bin 
Look for currently-running python's pip first
 2017-05-04 09:43:51 -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
Mike Place
ff39613a53 Merge pull request #41049 from Ch3LL/fix_wheel_test 
fix integration wheel test_gen test
 2017-05-04 09:33:58 -06:00
Mircea Ulinic
e3c40ea81a Outputters txt ref 2017-05-04 09:33:45 -06:00
Mircea Ulinic
20b307a310 Add New Modules section 2017-05-04 09:33:45 -06:00
Mircea Ulinic
7c8f14977b More NAPALM notes 2017-05-04 09:33:45 -06:00
Mike Place
b0c10ed2e0 Merge pull request #41064 from cloudflare/fix-netyang 
Nitrogen fixes for the napalm YANG modules
 2017-05-04 09:22:59 -06:00
Mike Place
c51f0bafbe Merge pull request #41065 from cloudflare/fix-napalm-syslog 
Preparing the napalm syslog engine for Nitrogen
 2017-05-04 09:22:05 -06:00
Nicole Thomas
4e4b3514b4 Merge pull request #41054 from terminalmage/salt-jenkins-315 
Update package targets for Arch pkg tests
 2017-05-04 08:59:42 -06:00
Nicole Thomas
62dff52820 Merge pull request #41046 from twangboy/fix_pkg_remove 
Fix pkg.remove
 2017-05-04 08:58:56 -06:00
Mircea Ulinic
e0e30934ce Fix compliance and netyang.managed state 2017-05-04 13:59:41 +00:00
Mircea Ulinic
c249551393 net.load_config arg: text instead of config 
RTFM: https://docs.saltstack.com/en/develop/ref/modules/all/salt.modules.napalm_network.html#salt.modules.napalm_network.load_config
 2017-05-04 14:07:01 +01:00