Commit Graph

84750 Commits

Author SHA1 Message Date
Damon Atkins
325a9f0f66
Update 2016.11.9.rst 2018-01-05 01:51:14 +11:00
Damon Atkins
4da9200b9c
Update 2016.11.9.rst 2018-01-05 01:46:20 +11:00
Damon Atkins
126aee36ac
Update 2016.11.9.rst 2018-01-05 01:38:22 +11:00
Damon Atkins
1c01967943
Update 2016.11.9.rst 2018-01-05 01:36:57 +11:00
Nicole Thomas
1c5e905b61
Merge pull request #45256 from rallytime/bp-45034
Back-port #45034 to 2016.11
2018-01-04 09:25:42 -05:00
Nicole Thomas
543eebf411
Merge pull request #45259 from Ch3LL/fix-mac-service-test
Fix MacOSX Service Status Check and integration test
2018-01-04 09:25:01 -05:00
Nicole Thomas
bbbd1872a7
Merge pull request #45263 from sumeetisp/2017.7
Updating python version for 2017.7
2018-01-04 09:16:26 -05:00
Nicole Thomas
d46e1197be
Merge pull request #45244 from twangboy/win_fix_portable.py
Fix search/replace in Py3
2018-01-04 09:02:21 -05:00
Nicole Thomas
b31e08946a
Merge branch '2017.7' into win_fix_dacl 2018-01-04 08:57:32 -05:00
Neeraj
b3660d5190 [#23454] make pydsl work with salt-ssh 2018-01-04 18:54:57 +05:30
Damon Atkins
a0d89882b8 Fix pkg.install packagename version=latest i.e. if on an old version upgrade to the latest 2018-01-04 21:20:14 +11:00
sumeetisp
e3a5ee3a08
Merge branch '2017.7' into 2017.7 2018-01-04 11:00:42 +05:30
sumeetisp
71aea9a3bc
Merge pull request #1 from sumeetisp/sumeetisp-python-version
Updating python version
2018-01-04 10:57:48 +05:30
sumeetisp
1b4806e2b9
Updating python version
As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency
2018-01-04 10:56:56 +05:30
Ch3LL
74e6ed60ea
Fix MacOSX Service Status Check and integration test 2018-01-03 17:19:51 -05:00
rallytime
68f971b38f
Apply test fixes from #45034 to parsers_test.py 2018-01-03 15:10:04 -05:00
Jochen Breuer
9454236694
Fix for pidfile removal logging
self.info does not exist. Switching to the 'normal' way of logging.
2018-01-03 14:58:26 -05:00
Volodymyr Samodid
6ceafbbf3a
use KillMode=process for salt-minion.service 2018-01-03 14:38:23 -05:00
Ch3LL
85e853a63d
Add darwin value for ssh grain items tests on MacOSX 2018-01-03 13:58:28 -05:00
twangboy
e3a8279c01
Get path to python binary based on executable 2018-01-03 10:19:09 -07:00
Nicole Thomas
eba360870a
Merge pull request #45233 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-03 10:33:59 -05:00
twangboy
03aec37040
Fix search/replace in Py3 2018-01-02 15:22:58 -07:00
rallytime
a3d251b2cd
Merge branch '2016.11' into '2017.7' 2018-01-02 15:21:58 -05:00
Nicole Thomas
b75f50afe3
Merge pull request #45235 from rallytime/bp-45209
Back-port #45209 to 2016.11
2018-01-02 15:20:14 -05:00
Nicole Thomas
693cc807e8
Merge pull request #45175 from amendlik/pkg-uptodate
Pkg uptodate
2018-01-02 12:38:35 -05:00
Daniel Wallace
2d0a9bbf7e
enable UsePAM for ssh tests 2018-01-02 12:29:43 -05:00
rallytime
5d9a1e91e9
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-01-02 12:23:50 -05:00
Nicole Thomas
3ab962b01a
Merge pull request #44965 from gtmanfred/2016.11
check if VALUE is a string_type
2018-01-02 11:42:38 -05:00
Nicole Thomas
40fb30f63f
Merge pull request #45232 from rasathus/2016.11
Backport #27160 to 2016.11
2018-01-02 10:48:22 -05:00
Nicole Thomas
4f514a29a7
Merge branch '2017.7' into pkg-uptodate 2018-01-02 09:56:28 -05:00
Rasathus
7a2bd8f49b
Merge branch '2016.11' into 2016.11 2018-01-02 12:38:13 +00:00
Daniel Wallace
1b3f3ba1be
Merge pull request #45226 from gtmanfred/2017.7
Update kitchen to use runtests verifier on 2017.7
2017-12-31 11:13:27 -07:00
Daniel Wallace
4f3b089e0e
fix copying back 2017-12-31 11:10:28 -07:00
Daniel Wallace
f56f062a6a
download xml for junit 2017-12-31 11:10:16 -07:00
Daniel Wallace
7cc342a5d6
use new runtests verifier 2017-12-31 11:10:01 -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
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
707ef55175
Merge pull request #45161 from lomeroe/bp-44944_2016.11
Backport #44944 to 2016.11
2017-12-30 08:19:35 -05: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
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
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
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