Commit Graph

70052 Commits

Author SHA1 Message Date
Mike Place
7f1654894d Merge pull request #37306 from DSRCorporation/bugs/35480_master_shutdown_no_process_error
Don't use os.wait() on subprocesses managed by `multiprocessing`.
2016-10-31 19:55:30 +13:00
Mike Place
bf8ba97d54 Merge pull request #37314 from rallytime/fix-34998
Document the existence of placementgroup option in ec2 driver
2016-10-31 19:42:33 +13:00
rallytime
39459ed30b Document the existence of placementgroup option in ec2 driver 2016-10-28 12:51:46 -06:00
Dmitry Kuzmenko
b6937ebaa8 Don't use os.wait() on subprocesses managed by multiprocessing.
See #35480 for details.
2016-10-28 17:04:43 +03:00
Mike Place
e0baf4b193 Merge pull request #37219 from alex-zel/fix-freeipa-ldap-groups
Fix freeipa ldap groups
2016-10-28 13:33:37 +09:00
Nicole Thomas
7d79ea7844 Update 2016.3.4 release notes (#37285) 2016-10-27 16:07:56 -06:00
Thomas S Hatch
3b62a89e45 Merge pull request #37282 from thatch45/raet_cpub
add cpub to raet event for compat
2016-10-27 15:33:48 -06:00
Thomas S Hatch
90f778dbc1 Add func for compat with main event system 2016-10-27 15:28:14 -06:00
Thomas S Hatch
8e52f425e4 add cpub to raet event for compat 2016-10-27 15:13:30 -06:00
Daniel Wallace
597f346d57 initialize super class of NamespacedDictWrapper
Fixes #37264
2016-10-27 14:28:01 -05:00
Justin Findlay
a2eae208c5 update 2016.3.4 release notes (#37278) 2016-10-27 10:18:18 -06:00
alex-zel
b5b2e7e097 Remove trailing whitespaces
Remove trailing whitespaces, change line 345 from 'if' to 'elif'
2016-10-27 09:27:33 +03:00
Mike Place
d0ce3de50c Merge pull request #37252 from vutny/suppress-init-grain-error
Set logging level to 'info' for message about init system detection
2016-10-27 15:15:01 +09:00
Nicole Thomas
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
Nicole Thomas
2087cfce90 Merge pull request #37257 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-10-26 11:32:36 -06:00
Thomas S Hatch
ea6155c3f4 Merge pull request #37254 from DSRCorporation/bugs/37191_minion_hangs
Bugs/37191 minion hangs
2016-10-26 10:28:41 -06:00
rallytime
2066f10d7b Merge branch '2015.8' into '2016.3'
No conflicts.
2016-10-26 10:16:05 -06:00
Dmitry Kuzmenko
9ee24b2d70 Revert "Don't set the daemon flag for LoggingQueue process."
This reverts commit c9c45a5d79.
2016-10-26 17:09:19 +03:00
Denys Havrysh
3f20cc01ed Set logging level to 'info' for message about init system detection 2016-10-26 15:56:28 +03:00
Mike Place
d1a6bb72ac Merge pull request #37218 from darkalia/37187_supervisor_2016.3
Issue #37187 Do not parse first /proc/1/cmdline binary if it's not *b…
2016-10-26 10:41:03 +09:00
Mike Place
760ed9f56d Merge pull request #37239 from Ch3LL/fix_cloud_timeout
Fix cloud tests timeout
2016-10-26 10:11:52 +09:00
Mike Place
6c5f619398 Merge pull request #37244 from rallytime/update-bootstrap
Update bootstrap release to 2016.10.25
2016-10-26 09:46:29 +09:00
Mike Place
bb7caf8c42 Merge pull request #37245 from rallytime/bp-36334
Back-port #36334 to 2016.3
2016-10-26 09:41:00 +09:00
Aditya Kulkarni
f64ca3c442 Update release notes and version added 2016-10-25 16:16:46 -06:00
Aditya Kulkarni
0a3d266d6b Add ability to specify disk backing mode for VMware cloud profile 2016-10-25 16:15:30 -06:00
rallytime
f728a5bc7b Update bootstrap release to 2016.10.25 2016-10-25 15:54:53 -06:00
Ch3LL
394fccf556 fix run_cloud timeout 2016-10-25 13:30:41 -06:00
Ch3LL
23947c5944 change timeout for cloud tests 2016-10-25 13:27:57 -06:00
Nicole Thomas
f49ccdf30f Merge pull request #37234 from rallytime/bp-37167
Back-port #37167 to 2015.8
2016-10-25 12:33:09 -06:00
Nicole Thomas
3c94315d35 Merge pull request #37233 from rallytime/bp-37154
Back-port #37154 to 2016.3
2016-10-25 12:32:56 -06:00
Nicole Thomas
94852f2eb1 Merge pull request #37232 from rallytime/bp-37153
Back-port #37153 to 2016.3
2016-10-25 12:32:41 -06:00
Nicole Thomas
a913eed92a Merge pull request #37228 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-10-25 12:22:57 -06:00
Daniel Kraemer
a7dbb5bfc9 fixes pkgrepo for fedora>22 saltstack/salt#31240
This makes modules.yumpkg complete independend from yum. yum is not
installed in fedora>22, so this will actually fix pkgrepo in fedora.
2016-10-25 10:48:19 -06:00
Alex Black
849af162f1 modules.win_system.py: Fix flag disabling AD Computer objects 2016-10-25 10:45:39 -06:00
Eric Radman
3829b7592f Update configuration examples for Joyent
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
2016-10-25 10:43:32 -06:00
rallytime
b99d6733b6 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-10-25 10:31:36 -06:00
Nevins Bartolomeo
99d2c360ed making messaging in tests match new return 2016-10-25 09:38:54 -04:00
iuccadm
32f906b020 Add support for FreeIPA
Add support to to authenticate a LDAP group in FreeIPA server
Required additional options in master config file:
1. auth.ldap.freeipa: True/False
2. auth.ldap.group_basedn: base DN for group search
3. auth.ldap.group_filter: filter for group search

for a default FreeIPA installation the options should be:
auth.ldap.freeipa: True
auth.ldap.group_basedn: 'cn=groups,cn=accounts,dc=example,dc=com'
auth.ldap.group_filter: '(&(member=uid={{ username }},cn=users,cn=accounts,dc=example,dc=comwq)(objectClass=posixgroup))'

Fixes issue #36148
2016-10-25 13:22:25 +03:00
Benjamin Allot
a8dfc6bb96 Issue #37187 Do not parse first /proc/1/cmdline binary if it's not *bin/init and set supervisord 2016-10-25 12:17:41 +02:00
Mike Place
6aaf6bf399 Merge pull request #37213 from cachedout/more_salttesting_fixes
More salttesting fixes
2016-10-25 16:53:33 +09:00
Mike Place
0bbf06bd86
Lint fix 2016-10-25 16:53:18 +09:00
Mike Place
f609917760
Workaround for utils 2016-10-25 16:51:30 +09:00
Mike Place
a6a24c2b3b
Workaround for tornado test startup error 2016-10-25 16:45:32 +09:00
Mike Place
88bcfa2c0a
Fix TCP test 2016-10-25 16:42:50 +09:00
Mike Place
b448455c31 Merge pull request #37207 from cachedout/issue_37194
Correct documentation for mine_functions
2016-10-25 16:25:08 +09:00
Mike Place
a5e1c041cc Merge pull request #37208 from cachedout/issue_37182
Give multimion a process manager and its own destroy method
2016-10-25 16:24:52 +09:00
Mike Place
1449770b0b
Give multimion a process manager and its own destroy method 2016-10-25 14:37:26 +09:00
Mike Place
e19ee88b6b Merge pull request #37206 from cachedout/transport_test_hang
Address transport test hang
2016-10-25 14:25:55 +09:00
Mike Place
9fcdf6da94
Correct documentation for mine_functions
Closes #37194
2016-10-25 14:12:46 +09:00
Mike Place
6737fd3ad9 Merge pull request #37179 from isbm/isbm-fix-saltapi-ssh-crash-2016-3
Fix Salt-API ssh crash (2016.3)
2016-10-25 13:52:19 +09:00