Commit Graph

89765 Commits

Author SHA1 Message Date
Daniel Wallace
7cc342a5d6
use new runtests verifier 2017-12-31 11:10:01 -07:00
Nicole Thomas
b3e0146ca1
Lint: 2 spaces before comment 2017-12-30 16:10:37 -05:00
Nicole Thomas
cc13a54e21
Merge pull request #45219 from gtmanfred/test_directory
test directory that doesn't exist
2017-12-30 13:11:33 -05:00
Daniel Wallace
1182f250ca
fix up rackspace/openstack cloud test 2017-12-30 11:09:45 -07:00
Daniel Wallace
7d3a6cbc65
Merge pull request #45221 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-30 11:08:29 -07:00
Daniel Wallace
b7932901ca
fix copying back 2017-12-30 11:00:03 -07:00
rallytime
da1e33abea
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - pkg/windows/req_base.txt
  - salt/engines/slack.py
  - salt/modules/cmdmod.py
  - salt/modules/osquery.py
  - salt/modules/pip.py
  - salt/modules/win_pkg.py
  - salt/states/pip_state.py
  - tests/integration/modules/test_cmdmod.py
2017-12-30 08:44:11 -05:00
rallytime
508599e159
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/win_lgpo.py
2017-12-30 08:32:16 -05:00
Nicole Thomas
abed378981
Merge pull request #45204 from garethgreenaway/45176_fixes_to_osquery_module
[2017.7] Fixes to osquery module & addition of unit tests
2017-12-30 08:25:37 -05:00
Nicole Thomas
296cda8e80
Merge pull request #45207 from terminalmage/py3-spm-queues-rosters
[PY3] Add unicode_literals to spm, queues, and rosters
2017-12-30 08:24:30 -05:00
Nicole Thomas
707ef55175
Merge pull request #45161 from lomeroe/bp-44944_2016.11
Backport #44944 to 2016.11
2017-12-30 08:19:35 -05:00
Nicole Thomas
51fc937577
Merge pull request #45220 from gtmanfred/kitchen
use new runtests verifier for kitchen-salt
2017-12-30 07:49:23 -05:00
Nicole Thomas
4637a3b43c
Merge pull request #45211 from terminalmage/py3-transport
[PY3] Add unicode_literals to transports
2017-12-30 07:40:51 -05:00
Daniel Wallace
8cb15ec689
download xml for junit 2017-12-29 15:00:54 -07:00
Daniel Wallace
d9e868ebd0
use new runtests verifier 2017-12-29 14:23:59 -07:00
Daniel Wallace
fd6597a2b4
test directory that doesn't exist
sometimes /etc/grub.conf exists and is a symlink to /boot/grub/grub.conf, and
this won't do the right thing.
2017-12-29 10:19:24 -07:00
Adam Mendlik
66884334d9
Update states.pkg for Python3 compatibility 2017-12-29 07:18:50 -07:00
Adam Mendlik
2a7d76ad6e
Fail pkg.uptodate if expected packages are not upgraded 2017-12-29 07:18:50 -07:00
Adam Mendlik
29ef67bac2
Test pkg.uptodate with failed upgrades 2017-12-29 07:18:50 -07:00
Adam Mendlik
23ab93353b
Produce changes dict for pkg.uptodate dry-run mode 2017-12-29 07:18:49 -07:00
Adam Mendlik
7c67ec39d9
Add tests for pkg.uptodate state 2017-12-29 07:18:49 -07:00
Nicole Thomas
d595c7af36
Merge pull request #45205 from terminalmage/py3-serializers
[PY3] Add unicode_literals to sdb and serializers
2017-12-28 20:12:31 -05:00
Nicole Thomas
5991d8ca15
Merge pull request #45203 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-28 20:11:02 -05:00
Nicole Thomas
eefb6d9224
Merge pull request #45209 from gtmanfred/oxygen
enable UsePAM for ssh tests
2017-12-28 20:08:14 -05:00
Gareth J. Greenaway
dc933e9e24
Fixing typo 2017-12-28 17:07:38 -08:00
Gareth J. Greenaway
d834bd1b6f
Fixing some minor lint issues. 2017-12-28 17:07:38 -08:00
Gareth J. Greenaway
4738205154
Fixing a bug when attributes are passed to various osquery module functions. 2017-12-28 17:07:38 -08:00
Erik Johnson
3f85b60077
[PY3] Add unicode_literals to transports 2017-12-28 17:10:42 -06:00
Nicole Thomas
882267314f
Merge pull request #45201 from rallytime/fix-jinja-template-test-failure
[2017.7] Check for running on python3 before decoding bytes
2017-12-28 17:59:13 -05:00
Nicole Thomas
2e18398f12
Merge pull request #45200 from rallytime/fix-docstring-test-failure
[2017.7] Fix docstring integration test failure
2017-12-28 17:58:33 -05:00
Daniel Wallace
0495c0de7f
enable UsePAM for ssh tests 2017-12-28 15:41:25 -07:00
Erik Johnson
f78c71bd6b
[PY3] Add unicode_literals to spm, queues, and rosters 2017-12-28 15:30:27 -06:00
Gareth J. Greenaway
a9c36b08ff
Gating the cron tests for the scheduler to ensure that the croniter module is installed before we attempt to run these tests 2017-12-28 11:21:18 -08:00
Gareth J. Greenaway
2f4653e271
Adding tests for cron functionality. 2017-12-28 11:21:18 -08:00
Erik Johnson
6f979773b8
[PY3] Add unicode_literals to sdb and serializers
NOTE: the other serializers were done in a previous commit.
2017-12-28 13:18:00 -06:00
Nicole Thomas
6f52034e08
Merge pull request #45199 from gtmanfred/status
status.pid returns pid ids not process names
2017-12-28 14:06:11 -05:00
Nicole Thomas
fc0046bf96
Merge pull request #45196 from rallytime/fix-45182
Don't log in the __virtual__() space in gcp_addon module
2017-12-28 14:03:06 -05:00
Nicole Thomas
67d97303b5
Merge pull request #45186 from rallytime/bp-44922
Back-port #44922 to 2017.7
2017-12-28 14:02:50 -05:00
Nicole Thomas
4ff2d1ab18
Merge pull request #44578 from gtmanfred/ssh
enable calling SaltSSH minions from the salt master
2017-12-28 13:02:38 -05:00
rallytime
430c913c8c
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/auth/pam.py
  - salt/master.py
  - tests/unit/test_target.py
2017-12-28 12:15:54 -05:00
rallytime
b4af3bdff8
Check for running on python3 before decoding bytes
Fixes a test failure caused by #45090:
- unit.templates.test_jinja.TestCustomExtensions.test_http_query
2017-12-28 11:17:44 -05:00
rallytime
a26d4795bd
[2017.7] Fix docstring integration test failure 2017-12-28 10:59:16 -05:00
Daniel Wallace
fb07f9ea7d
status.pid returns pid ids not process names 2017-12-28 08:25:26 -07:00
Daniel Wallace
eb2dad36dd
fix pylint 2017-12-28 07:49:06 -07:00
Daniel Wallace
262405b0e8
split out publishing to ssh minions
and clean up docs
2017-12-28 07:49:06 -07:00
Daniel Wallace
190110be8f
switch to threading 2017-12-28 07:49:06 -07:00
Daniel Wallace
d100437639
fix pylint 2017-12-28 07:49:05 -07:00
Daniel Wallace
efe50f4b3a
Daemonize salt-ssh process 2017-12-28 07:49:05 -07:00
Daniel Wallace
3a5dc8e71b
make sure all args are strings
when calling from `enable_ssh_minions` they could be other things.
2017-12-28 07:49:05 -07:00
Daniel Wallace
7e9f673675
make the jid in the ssh minion payload the same as the one for the tag 2017-12-28 07:49:05 -07:00