Daniel Wallace
a5c1410e23
catch IOError when copying xml files back
2017-12-20 18:26:18 -07:00
Gareth J. Greenaway
b3e2f388f5
Fix to allow nodegroups to include sequences
2017-12-20 16:56:16 -08:00
Daniel Wallace
23bd38ad66
enable using kitchen-salt on ec2
...
These changes are needed to run the test suite on ec2 using sudo.
2017-12-20 17:18:39 -07:00
Nicole Thomas
42e894570d
Merge pull request #45087 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-20 17:24:50 -05:00
twangboy
cf5eae1f77
Move pam library load to try/except block
...
Because there is no pam library in Windows this was causing a stack
trace to occur
2017-12-20 15:12:32 -07:00
Nicole Thomas
9550e742ac
Merge pull request #45112 from Ch3LL/fix-arch
...
Fix spm big file build test to check /tmp
2017-12-20 17:09:20 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp
2017-12-20 14:40:10 -05:00
Nicole Thomas
71f9c7ee49
Merge pull request #45068 from rallytime/bp-44976
...
Back-port #44976 to 2017.7
2017-12-20 11:31:21 -05:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-12-20 10:26:10 -05:00
Nicole Thomas
7e128e8f15
Merge pull request #45100 from rallytime/bp-45070
...
Back-port #45070 to 2016.11
2017-12-20 09:55:00 -05:00
Erik Johnson
54a33c0e1d
Merge pull request #45099 from rallytime/bp-44983
...
Back-port #44983 to 2017.7
2017-12-20 08:41:21 -06:00
Erik Johnson
bdf93f339d
Merge pull request #45098 from rallytime/bp-45092
...
Back-port #45092 to 2016.11
2017-12-20 08:40:51 -06:00
Vernon Cole
0bdb46dab9
add clouds modules to index
2017-12-20 06:58:09 -05:00
Victor
23361de8a2
Ref:44961 - Modified archive.tar to add dest argument at the end of the tar cmd.
2017-12-20 06:56:19 -05:00
Erik Johnson
80b6bd6813
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
...
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
2017-12-20 06:54:30 -05:00
angeloudy
cf411f8984
Merge branch '2017.7' into 2017.7
2017-12-20 09:51:34 +11:00
angeloudy
177fd18671
fix TypeError in python 3
...
move 383d1e9970
2017-12-20 09:49:07 +11:00
rallytime
4f21a2bbfd
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- salt/runners/manage.py
2017-12-19 12:57:51 -05:00
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status
...
add status.pid test
2017-12-19 11:21:08 -05:00
Nicole Thomas
49a6a8f02e
Merge branch '2017.7' into avoid_unneeded_pip_install
2017-12-19 11:19:57 -05:00
Nicole Thomas
324b7d4058
Merge pull request #44078 from rossengeorgiev/fix-41044
...
user.present: allow date param to be 0
2017-12-19 10:59:28 -05:00
Nicole Thomas
48a59761df
Merge pull request #44970 from rallytime/update-bootstrap-script
...
Update bootstrap script to latest release: 2017.12.13
2017-12-19 10:49:05 -05:00
Nicole Thomas
422d8b8f1b
Merge pull request #44944 from lomeroe/update_regpol_encoding
...
win_lgpo registry.pol encoding updates
2017-12-19 09:42:48 -05:00
Nicole Thomas
637fdaed58
Merge pull request #45069 from rallytime/bp-45040
...
Back-port #45040 to 2016.11
2017-12-19 09:25:57 -05:00
Chris Fane
de53c45c29
Backport #27160 to 2016.11
2017-12-18 21:07:06 +00:00
Jan Harasym
aa438e1605
Installation Fails on headless machines.
...
Installation fails on headless machines if `/passive` is set, `/passive` will display an installation progress bar on windows desktop. `/quiet` suppresses the GUI and does not fail when there is no desktop session available. Fixes #45036 .
2017-12-18 13:56:58 -05:00
Tom Williams
0ca0f37805
44303 - resolves #44303
2017-12-18 13:54:17 -05:00
Nicole Thomas
d9a4b9681e
Merge pull request #44938 from The-Loeki/libcloud_dns_fixes
...
Libcloud dns fixes
2017-12-18 10:47:18 -05:00
Ronald van Zantvoort
276e8828ae
libcloud_dns: pylint fix
2017-12-18 14:32:04 +01:00
Ronald van Zantvoort
c994423286
Merge branch '2017.7' into libcloud_dns_fixes
2017-12-18 12:49:33 +01:00
Ronald van Zantvoort
c72db283d5
libcloud_dns: Further fixes to state output, pylint fixes
2017-12-18 12:40:55 +01:00
rcallphin
04ab6a5e9d
Merge branch '2017.7' into fix-bug-vault-empty-policy
2017-12-16 09:57:37 -07:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-16 08:16:23 -05:00
lomeroe
07d04c7bc7
lint fixes for static regexes
2017-12-15 15:04:51 -06:00
lomeroe
d17c46ce41
lint fixes
...
encode some of the more used characters in variables and re-use instead
of re-encoding them over and over
remove a line that was commented out
2017-12-15 15:04:51 -06:00
lomeroe
ab8e431729
do not decode registry.pol file wholesale, but instead decode individual
...
elements of the file
also fix issue where the get_policy_info function would not find
policies in the policy_data class by their "short" name (i.e. the key
name in the dict)
2017-12-15 15:04:51 -06:00
Nicole Thomas
4d6d640381
Merge pull request #44969 from rallytime/bp-41305
...
Back-port #41305 to 2016.11
2017-12-15 12:22:17 -05:00
Nicole Thomas
698b04779e
Merge pull request #44995 from twangboy/win_fix_atomicfile
...
Fix `unit.modules.test_file` for Windows
2017-12-15 12:05:48 -05:00
Nicole Thomas
10de468f13
Merge pull request #45031 from terminalmage/fix-mysql-returner
...
Fix invalid exception class in mysql returner
2017-12-15 10:00:14 -05:00
Erik Johnson
f3bd12c27c
Fix invalid exception class in mysql returner
...
salt.exceptions.Salt does not exist
2017-12-14 23:13:56 -06:00
Frode Gundersen
48e6953e1f
fix_string_error
2017-12-14 22:40:59 +00:00
Nicole Thomas
2e1a57b9bc
Merge pull request #44968 from gtmanfred/http
...
fix http wait for state
2017-12-14 15:06:00 -05:00
Giandom
4526c158f1
added-highstate-output-to-slack-engine
2017-12-14 19:21:40 +01:00
Giandom
573a0a4143
added-highstate-output-to-slack-engine
2017-12-14 19:20:38 +01:00
Nicole Thomas
e9bbc23b11
Merge branch '2017.7' into libcloud_dns_fixes
2017-12-14 12:38:05 -05:00
Nicole Thomas
c4f0894689
Merge pull request #44900 from xuhcc/rbenv-ret-fix
...
Fix TypeError during rbenv ruby installation when rbenv is not found
2017-12-14 12:37:13 -05:00
Nicole Thomas
9a7406207f
Merge pull request #44972 from terminalmage/bp-44958
...
Backport #44958 to 2016.11 branch
2017-12-14 11:56:01 -05:00
twangboy
8316481944
Comment the salt import
2017-12-14 09:04:26 -07:00
twangboy
fe34f0c877
Set owner properly on Windows
2017-12-14 08:57:30 -07:00
Nicole Thomas
f0c2cf3cec
Merge pull request #44974 from twangboy/win_skip_test_parsers
...
Skip test_log_created on Windows
2017-12-14 08:59:24 -05:00
