Nicole Thomas
438a16626a
Merge pull request #45317 from terminalmage/py3-config-executors
...
[PY3] Add unicode_literals to config, executors
2018-01-08 12:07:08 -05:00
Erik Johnson
a0722fa934
PY3 compatibility: ensure we are passing a list instead of dict_values
...
Fixes #45243 .
2018-01-08 11:03:48 -06:00
Gareth J. Greenaway
68bf2b9f85
Merge pull request #45278 from gtmanfred/oxygen
...
clean up for windows tests for kitchen-salt
2018-01-08 08:10:02 -08:00
Ch3LL
0919d8787b
Skip iscsi grains test if MacOSX
2018-01-08 10:54:45 -05:00
Erik Johnson
7c9d95a725
[PY3] Add unicode_literals to config, executors
2018-01-07 14:48:45 -06:00
Erik Johnson
0d975c335d
Add unicode_literals to engines
2018-01-07 14:01:48 -06:00
Daniel Wallace
a8341fea01
clean up for windows tests for kitchen-salt
2018-01-06 17:14:46 -07:00
Nicole Thomas
e6178fe6d4
Merge branch '2017.7' into test_directory
2018-01-05 17:08:58 -05:00
Nicole Thomas
538d459b88
Merge pull request #45284 from twangboy/win_fix_build_env
...
Put pywin32 dlls in correct location in buildenv scripts
2018-01-05 16:54:21 -05:00
Daniel Wallace
64d7cf165e
if check should be not
2018-01-05 14:43:13 -07:00
Erik Johnson
5b91c78cb6
[PY3] Add unicode_literals to daemons modules
2018-01-05 15:34:48 -06:00
Ch3LL
9a35a73711
add time limit to while loop
2018-01-05 16:18:31 -05:00
twangboy
2c47d03150
Add pythonnet dependency for Windows
2018-01-05 13:44:30 -07:00
Daniel Wallace
b295ec0429
make dummy proxy module py3 compatible
2018-01-05 13:36:09 -07:00
Daniel Wallace
8736e21f65
fix starting proxy minion on py3
2018-01-05 13:36:09 -07:00
Daniel Wallace
e2824a7253
fix py3 tests
2018-01-05 13:36:08 -07:00
Gareth J. Greenaway
edfc3dc078
Adding in documention for auth_events configuration option
2018-01-05 12:29:21 -08:00
Daniel Wallace
24114e91c1
test was different slightly on 2017.7
2018-01-05 12:25:09 -07:00
Gareth J. Greenaway
3ee4eabffd
Fixing small typo
2018-01-05 10:06:50 -08:00
Gareth J. Greenaway
6a28bddcc9
Adding some code to config gate if auth_events are sent
2018-01-05 10:06:50 -08:00
Nicole Thomas
dab4a8cff3
Merge pull request #44853 from gtmanfred/vault
...
remove not from vault utils
2018-01-05 12:43:17 -05:00
Nicole Thomas
239ab765d9
Merge pull request #45271 from terminalmage/py3-cloud
...
[PY3] Add unicode_literals to salt-cloud modules
2018-01-05 12:38:01 -05:00
Ch3LL
4e569b5802
Allow macosx service state tests to check for pid return
2018-01-05 12:25:44 -05:00
Daniel Wallace
d20fc93625
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.
2018-01-05 09:51:58 -07:00
Erik Johnson
49dd5b32e9
[PY3] Add unicode_literals to acl, auth, and netapi modules
2018-01-05 10:31:11 -06:00
Nicole Thomas
f09d0e5fdb
Merge pull request #45277 from rallytime/bp-45025
...
Back-port #45025 to 2017.7
2018-01-05 10:35:52 -05:00
Nicole Thomas
fc84f1104f
Merge pull request #45276 from rallytime/bp-45260
...
Back-port #45260 to 2017.7
2018-01-05 09:45:39 -05:00
twangboy
187a420327
Copy not move dlls for PY2
2018-01-04 17:15:00 -07:00
twangboy
8c732b5294
Put dlls in both places for Py2 and Py3
2018-01-04 16:40:43 -07:00
twangboy
2d636266e8
Put dlls in right place for py2 and py3
...
Py2 dlls go in site-packages\win32
Py3 dlls go in site-packages\win32 and the root of python
2018-01-04 15:59:04 -07:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/client/ssh/wrapper/state.py
- salt/modules/yumpkg.py
2018-01-04 17:45:29 -05:00
rallytime
8025b14584
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/utils/test_parsers.py
2018-01-04 17:37:48 -05:00
Steve Weber
942c14bb29
pillar body overrides includes
...
vars in pillar body override pillar includes
2018-01-04 17:33:39 -05:00
s8weber
1152202fdc
fix pillar includes from merging over the current sls defines
...
ihttps://github.com/saltstack/salt/issues/39860
2018-01-04 17:33:29 -05:00
Daniel Wallace
9ab1af738f
switch kitchen-salt to use rsync transport to preserve symlinks
2018-01-04 17:29:45 -05:00
Daniel Wallace
cf98ed472e
fix up symlinks
2018-01-04 17:29:45 -05:00
Nicole Thomas
63172299bf
Merge pull request #45262 from terminalmage/py3-pillar
...
[PY3] Add unicode_literals to ext_pillar modules
2018-01-04 17:21:53 -05:00
Erik Johnson
7f7fdae9b4
yumpkg: don't use diff_attr when determining install/downgrade targets
...
Doing so breaks epoch handling, and is unnecessary anyway since the
diff_attr is only used for the return data.
Additionally, this tweaks the "attr" argument in both yumpkg and
zypper's list_pkgs func so that it will accept a comma-separated list as
well as a Python list, and makes a DRY tweak so that we're only
returning and formatting the return data in one place in the function.
2018-01-04 16:17:25 -06:00
Nicole Thomas
ff9880c498
Merge pull request #45255 from rallytime/bp-44427
...
Back-port #44427 to 2017.7
2018-01-04 16:46:16 -05:00
Nicole Thomas
e715eb603f
Merge pull request #45251 from forksaber/salt-ssh-pydsl
...
Fix #23454 : make pydsl work with salt-ssh
2018-01-04 16:33:09 -05:00
Nicole Thomas
2934b60d53
Merge pull request #45254 from Ch3LL/fix_mac_grain_ssh
...
Add darwin value for ssh grain items tests on MacOSX
2018-01-04 16:31:34 -05:00
twangboy
391164e322
Pass if zfs module fails to load
2018-01-04 14:26:12 -07:00
Nicole Thomas
af2d880303
Merge pull request #45135 from twangboy/win_fix_dacl
...
Fix win_dacl problems with SIDs
2018-01-04 16:01:47 -05:00
Nicole Thomas
d0a3770035
Merge pull request #44930 from frogunder/man_spm
...
man_spm_test
2018-01-04 15:58:01 -05:00
Ch3LL
b4b59b89cd
remove platform from salt.utils call for 2017.7
2018-01-04 14:42:30 -05:00
Erik Johnson
d3f8c13414
[PY3] Add unicode_literals to salt-cloud modules
2018-01-04 13:39:59 -06:00
Damon Atkins
325a9f0f66
Update 2016.11.9.rst
2018-01-05 01:51:14 +11:00
Erik Johnson
1dc6e79638
[PY3] Add unicode_literals to ext_pillar modules
2018-01-04 08:46:40 -06: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
