rallytime
f20f3742cb
Merge branch '2017.7' into 'develop'
...
Conflicts:
- tests/unit/test_crypt.py
2017-08-07 10:43:06 -04:00
Nicole Thomas
3f5827f61e
Merge pull request #42651 from gtmanfred/2017.7
...
python2- prefix for fedora 26 packages
2017-08-07 10:35:04 -04:00
Nicole Thomas
3858bc99b8
Merge pull request #42650 from cachedout/fixup_42369
...
Fix mixins error with new yaml dumper
2017-08-07 10:19:11 -04:00
Mike Place
82582f0304
Merge pull request #42174 from mcalmer/2017.7-kubernetes-cert-auth
...
kubernetes: provide client certificate authentication
2017-08-06 13:10:24 -05:00
Mike Place
ea16eb24cd
Merge pull request #42658 from alektant/patch-1
...
Update libvirt.rst
2017-08-06 12:52:30 -05:00
Mike Place
791248e398
Merge pull request #42689 from hibbert/boto_efs_fix_tags
...
boto_efs_fix_tags: Fix #42688 invalid type for parameter tags
2017-08-06 12:47:06 -05:00
garethgreenaway
2572ce7aad
Merge branch 'develop' into fixup_42369
2017-08-05 14:59:07 -07:00
garethgreenaway
1b3407649b
Merge pull request #42745 from terminalmage/issue42705
...
docker.compare_container: treat null oom_kill_disable as False
2017-08-05 08:28:19 -07:00
Erik Johnson
710bdf6115
docker.compare_container: treat null oom_kill_disable as False
...
Resolves #42705 .
2017-08-04 21:47:07 -05:00
Mike Place
5d5b22021b
Merge pull request #42704 from whiteinge/expr_form-warn-scope-bug
...
Add import to work around likely multiprocessing scoping bug
2017-08-04 18:03:13 -05:00
garethgreenaway
7ab66574a0
Merge branch 'develop' into patch-1
2017-08-04 10:26:37 -07:00
garethgreenaway
888e954e73
Merge pull request #42743 from kkoppel/fix-issue-42741
...
Fix docker.compare_container for containers with links
2017-08-04 09:00:33 -07:00
garethgreenaway
de6d3cc0cf
Update dockermod.py
2017-08-04 08:59:33 -07:00
garethgreenaway
03a7f9bbee
Merge pull request #42710 from gtmanfred/syndic
...
use subtraction instead of or
2017-08-04 08:14:13 -07:00
Kristjan Koppel
58b997c67f
Added a helper function that removes container names from container HostConfig:Links values to enable compare_container() to make the correct decision about differences in links.
...
Fixes #42741
2017-08-04 15:35:41 +03:00
Mike Place
547ada9418
Merge pull request #42612 from nhavens/develop
...
fix for issue #42611
2017-08-03 17:37:05 -05:00
Mike Place
b8acf9f6ec
Merge pull request #42624 from lyft/modernize-boto-sqs-modules
...
Modernize boto_sqs execution and state modules
2017-08-03 17:34:18 -05:00
Mike Place
58ea6d87c9
Merge branch 'develop' into patch-1
2017-08-03 15:35:53 -05:00
Mike Place
005182b6a1
Merge pull request #42670 from gtmanfred/kube
...
render kubernetes docs
2017-08-03 15:30:55 -05:00
Mike Place
df354ddabf
Merge pull request #42712 from twangboy/win_build_pkg
...
Remove master config file from minion-only installer
2017-08-03 15:25:02 -05:00
Daniel Wallace
683561a711
use subtraction instead of or
...
If we use or, we will get minions that are in the ret list, but not connected
to the master in cases where the syndic is used.
2017-08-03 09:02:49 -06:00
Daniel Wallace
8784899942
fix syntax
2017-08-03 09:02:09 -06:00
Daniel Wallace
178cc1bd81
make sure names are correct
2017-08-03 09:02:09 -06:00
Daniel Wallace
f179b97b52
add py3 for versionlock
2017-08-03 09:02:09 -06:00
Daniel Wallace
1958d18634
python2- prefix for fedora 26 packages
2017-08-03 09:02:09 -06:00
Daniel Wallace
bca17902f5
add version added info
2017-08-03 09:01:34 -06:00
Daniel Wallace
4bbfc751ae
render kubernetes docs
2017-08-03 09:01:34 -06:00
Mike Place
bb1dfd4a42
Merge pull request #42714 from cachedout/workaround_jnpr_test_bug
...
Set fact gathering style to 'old' for test_junos
2017-08-03 08:39:39 -05:00
Mike Place
834d6c605e
Set fact gathering style to 'old' for test_junos
...
Without this, we stacktrace because it does not appear that setting
'gather_facts' to False prevents the library from assuming the presence
of facts. I believe this to be an upstream bug with jnpr.
Because they have listed this as being a deprecated option in the future
this may re-break in the future.
2017-08-02 23:11:52 -06:00
twangboy
8604312a7b
Remove master conf in minion install
2017-08-02 17:12:02 -06:00
Seth House
03b675a618
Add import to work around likely multiprocessing scoping bug
...
Fixes #42649 .
2017-08-02 12:51:59 -06:00
Andy Hibbert
157fb28851
boto_efs_fix_tags: Fix #42688 invalid type for parameter tags
...
Change-Id: Ibab5417074b1ac98ee025c421d04674070745edf
2017-08-02 15:59:08 +01:00
Neile Havens
e38fcf8f7d
Merge branch 'develop' into develop
2017-08-01 17:28:52 -05:00
Mike Place
4c1d931654
Merge pull request #42481 from twangboy/win_unit_test_crypt
...
Fix `unit.test_crypt` for Windows
2017-08-01 13:10:49 -05:00
Mike Place
1b9cb26f2e
Merge pull request #42631 from jeduardo/lxc-consistency-fixes
...
Fix lxc module to operate as per the docs for container memory configuration
2017-08-01 13:02:38 -05:00
Mike Place
8bcefb5e67
Merge pull request #42654 from morganwillcock/zfsgrain
...
Disable ZFS in the core grain for NetBSD
2017-08-01 12:52:36 -05:00
Alek Tant
2f9645c0d0
Merge branch 'develop' into patch-1
2017-07-31 21:17:13 -04:00
Mike Place
039eeb71dc
Just use Dumper
2017-07-31 15:28:15 -06:00
Neile Havens
afce919746
Merge branch 'develop' into develop
2017-07-31 15:51:10 -05:00
Morgan Willcock
49023deb94
Disable ZFS grain on NetBSD
2017-07-31 21:17:35 +01:00
J. Eduardo
b46de3f976
Merge branch 'develop' into lxc-consistency-fixes
2017-07-31 22:06:56 +02:00
Mike Place
968a9dba46
Merge pull request #42354 from alexbleotu/vmware_logs_and_no_permission_exc-gh
...
VMware utils functions: additional logs & raise NoPermission exceptions
2017-07-31 15:03:45 -05:00
Mike Place
b5304e73db
Merge pull request #42426 from michaelgibson/features/issue-42280
...
adding 2-factor auth capability to ldap eauth module - #42280
2017-07-31 15:01:43 -05:00
Mike Place
5baf2650fc
Merge pull request #42453 from gtmanfred/makedirs
...
don't pass user to makedirs on windows
2017-07-31 14:57:57 -05:00
Mike Place
fb81e78f71
Merge pull request #42603 from twangboy/win_fix_runas
...
Add runas_passwd as a global for states
2017-07-31 14:49:48 -05:00
Mike Place
184ee37cf7
Merge pull request #42492 from sahama/develop
...
remove .encode(__salt_system_encoding__))
2017-07-31 14:46:56 -05:00
Mike Place
558bdb346a
Merge pull request #42594 from rallytime/preflight_cmds
...
Add a "preflight_cmds" option to salt-cloud
2017-07-31 14:45:27 -05:00
Mike Place
a09091a696
Merge pull request #42517 from alexbleotu/linux_acl_fixes-gh
...
Fixes to linux_acl.present state & cmd.run function
2017-07-31 14:44:57 -05:00
Mike Place
75ba23c253
Merge pull request #42541 from epita/fix-file-line-warning
...
Avoid confusing warning when using file.line
2017-07-31 14:41:57 -05:00
Mike Place
3d328eba80
Merge pull request #42625 from twangboy/fix_win_wua
...
Fix the list function in the win_wua execution module
2017-07-31 14:27:15 -05:00
