Commit Graph

84744 Commits

Author SHA1 Message Date
rallytime
9f547a31f0
Merge branch '2016.11' into '2017.7' 2018-01-16 17:19:08 -05:00
Nicole Thomas
b756760415
Merge pull request #45482 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.11.9 to 2016.11
2018-01-16 17:17:45 -05:00
rallytime
3b38c77159
Merge branch '2016.11.9' into '2016.11'
No conflicts.
2018-01-16 17:16:26 -05:00
Nicole Thomas
96ae237d37
Merge pull request #45448 from rallytime/merge-2016.11.9
[2016.11] Merge forward from 2016.11.9 to 2016.11
2018-01-16 15:09:00 -05:00
Nicole Thomas
7322efba92
Merge pull request #45446 from rallytime/bp-45390
Back-port #45390 to 2016.11.9
2018-01-16 15:08:38 -05:00
Nicole Thomas
5f58a87e84
Merge pull request #45365 from meaksh/2017.7-issue-45345
Return an error when "gid_from_name" is set but group does not exist
2018-01-16 13:31:49 -05:00
Pablo Suárez Hernández
da23067f80
Refactor to prevent logical bug when gid is 0 2018-01-16 15:21:22 +00:00
Nicole Thomas
de080983e3
Merge pull request #44822 from frogunder/pkg_latestversion
add pkg_latest_version test
2018-01-16 09:16:53 -05:00
Pablo Suárez Hernández
9fdaa0d5e9
Update documentation for 'gid_from_name' parameter 2018-01-16 13:36:43 +00:00
rallytime
646379d981
Merge branch '2016.11' into '2016.11.9'
No conflicts.
2018-01-14 10:24:02 -05:00
Nicole Thomas
cb3e0cffb3
Merge pull request #45435 from rallytime/bp-45401
Back-port #45401 to 2017.7
2018-01-14 07:43:47 -05:00
Erik Johnson
1ed323a3ee
Merge pull request #45437 from terminalmage/fix-docstring
Fix incorrect wording in jboss7 docstrings
2018-01-13 17:16:13 -06:00
Erik Johnson
c11b16dc29
Fix incorrect wording in jboss7 docstrings 2018-01-13 16:05:25 -06:00
Daniel Wallace
b9761971c2
fix moto version
Fixes saltstack/salt-jenkins#692
2018-01-13 15:01:14 -05:00
Daniel Wallace
0cd95d1cc6
fix test boto imports
Test boto imports are failing for some reason
2018-01-13 15:01:14 -05:00
Nicole Thomas
b0ece9f4d4
Merge pull request #45424 from twangboy/win_reg
Fix some issues with reg.py
2018-01-13 14:34:47 -05:00
twangboy
30f06205f7
Fix some issues with reg.py
Was throwing a key not found in instances where the key was found but
the key/value pair inside was not found.
Use trace instead of debug to show this issue... very noisy
2018-01-12 14:34:29 -07:00
Nicole Thomas
600fa3939f
Merge pull request #45390 from damon-atkins/2016.11_win_pkg_remove_final_fixes
win_pkg: fix pkg.remove, pkg.list_pkgs
2018-01-12 12:52:23 -05:00
Nicole Thomas
057df44a4a
Merge pull request #45399 from terminalmage/fix-git.latest-depth
Fix git.latest failure when rev is not the default branch
2018-01-12 09:55:17 -05:00
Pablo Suárez Hernández
52f9c06908
Fix integration tests for 'user.present' state. 2018-01-12 12:47:29 +00:00
Pablo Suárez Hernández
e2c32dc6dc
Make pylint happy 2018-01-12 12:47:28 +00:00
Pablo Suárez Hernández
a18dbe0c11
Return error when gid_from_name and group does not exist.
Fixes #45345
2018-01-12 12:47:28 +00:00
Pablo Suárez Hernández
ce7b1f4baf
Ensure empty string gid is set to None 2018-01-12 12:47:28 +00:00
Damon Atkins
69f045ea24 lint too-many-blank-lines 2018-01-12 19:49:19 +11:00
Erik Johnson
0cbc6767bf
Fix git.latest failure when rev is not the default branch 2018-01-11 15:26:35 -06:00
Nicole Thomas
2340f0b487
Merge pull request #45380 from twangboy/backport_45308
Backport changes from #45308
2018-01-11 14:45:20 -05:00
Frode Gundersen
08644e02a0
skip if mac 2018-01-11 19:12:31 +00:00
Nicole Thomas
f7da716d32
Merge pull request #45294 from gtmanfred/2017.7
include backports_abc
2018-01-11 13:18:15 -05:00
Nicole Thomas
f77a3e9cd4
Merge pull request #45381 from gtmanfred/module.run
fix module.run docs
2018-01-11 13:02:37 -05:00
Nicole Thomas
8efd29f4d9
Merge pull request #45368 from DSRCorporation/bugs/zmq_draft
Fixes to work with pyzmq with --enable-drafts
2018-01-11 12:53:15 -05:00
Nicole Thomas
22c3efda06
Merge pull request #45371 from rallytime/bp-45158
Back-port #45158 to 2017.7
2018-01-11 12:51:37 -05:00
Nicole Thomas
3a0e2de995
Merge pull request #45387 from renner/patch-2
Set SHELL environment variable
2018-01-11 11:23:21 -05:00
Nicole Thomas
dcf98a2260
Merge pull request #45388 from terminalmage/fix-test-loader-error
Fix loader error in 2017.7 tests
2018-01-11 11:13:52 -05:00
Daniel Wallace
230e899192
fix module.run docs 2018-01-11 09:12:19 -07:00
Damon Atkins
10a7501ede
Update release notes 2018-01-12 03:11:07 +11:00
Damon Atkins
6f2affe01c fix pkg.remove, pkg.list_pkgs
- lint fixes
- list_pkgs() now returns multiple versions if software installed more than once.
- list_pkgs() now returns 'Not Found' when the version is not found instead of '(value not set)' which matches the contents of the sls definitions.
- list_pkgs() has had some improvements in correctly detecting valid software entries.
- remove() replaced 1,000 loop calls of list_pkgs which runs for unknown number of seconds, with a 3 second timeout with 0.5 delay between tries. This greating increase the chance of detecting the software changes.
- remove() with a version specified which was not installed, removed any version, now no longer removes the wrong version.
- remove() handles latest as a version, and also looks for this in the sls definition if no other options available. This helps support software which auto updates.
2018-01-12 02:51:35 +11:00
Erik Johnson
5473c085d9
Fix loader error in 2017.7 tests 2018-01-11 08:40:27 -06:00
Nicole Thomas
d15f9e1020
Merge pull request #45382 from terminalmage/salt-jenkins-686
Skip flaky test on 2017.7 branch
2018-01-11 09:23:04 -05:00
Johannes Renner
530ddd2d29
Set SHELL environment variable
When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed to execute the given command.
2018-01-11 13:37:38 +01:00
Dmitry Kuzmenko
7622e355cf
Minor: removed a stale comment. 2018-01-11 14:03:41 +03:00
Dmitry Kuzmenko
00f31bf9b5
Fixes to work with pyzmq with --enable-drafts
1. Let pyzmq to correctly cleanup stream by itself

2. Don't close IOLoop that closes managed IO objects until full async
object cleanup that produces closing streams and attempts to operate to
strutures deinitialized by the closed IOLoop.
2018-01-11 14:03:38 +03:00
Nicole Thomas
dbe21b2c0d
Merge pull request #45369 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-10 17:14:04 -05:00
Erik Johnson
ff3039db6c
Skip flaky test on 2017.7 branch
The behavior of the set union used to combine ext_nodes and top file
matches is not consistent on Python 3 (well, 3.5 at least), and this
produces flaky test results.

Since we do not change things like the state compiler in point
releases, the method used to combine the ext_nodes and top file matches
has been changed for Oxygen and is now fully deterministic. This test
will therefore be skipped for the remainder of the 2017.7 release cycle
on Python 3.

Fixes https://github.com/saltstack/salt-jenkins/issues/686.
2018-01-10 16:02:32 -06:00
Nicole Thomas
55979b3a48
Merge pull request #45379 from rhoths/rhoths-doc-highstate-1
Minor spelling/grammar fixes in the highstate returner documentation
2018-01-10 15:09:51 -05:00
Chase Urich
afbbd492cd Minor spelling/grammar fixes in highstate returner 2018-01-10 12:18:55 -06:00
twangboy
419be8a9b5
Backport changes from #45308 2018-01-10 11:16:59 -07:00
Daniel Wallace
3633ceeaa7
Merge branch '2017.7' into 2017.7 2018-01-10 11:11:29 -07:00
Nicole Thomas
541e59fa75
Merge pull request #45358 from UtahDave/gate_data_cache_refresh
gate the minion data cache refresh events.
2018-01-10 12:21:04 -05:00
Erik Johnson
3565bc2bf2
Don't use include-test SLS in orch tests
This was the _actual_ cause of the failing test in the state module
integration tests.
2018-01-10 10:29:15 -05:00
Erik Johnson
8bc17e0d7a
Fix integration.modules.test_state.StateModuleTest.test_exclude
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.

This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
2018-01-10 10:29:15 -05:00