valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,584 Commits 24 Branches 182 Tags 341 MiB
6332da5c44
Commit Graph

74584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
6332da5c44 Prep release notes for 2016.11 2016-10-31 13:05:24 -06:00
rallytime
d4364d284a Officially update version.py for carbon to be 2016.11.0 2016-10-31 11:46:00 -06:00
rallytime
adcceb633b Cleanup "carbon" refs and replace with 2016.11.0 2016-10-31 11:38:27 -06:00
Nicole Thomas
dde8c71408 Merge pull request #37352 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-31 11:20:18 -06:00
rallytime
e10058c831 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-31 10:15:25 -06:00
Mike Place
2b2cfe9f50 Merge pull request #37341 from cachedout/process_test 
Process test
 2016-10-31 23:22:50 +13:00
Mike Place
02d61e5928
Lint 2016-10-31 23:21:43 +13:00
Mike Place
3d36f47d53
Skip process test on < 2.7 
There is an unfixed bug in 2.6 that makes this unstable.
 2016-10-31 23:20:48 +13:00
Mike Place
25c987e33a Merge pull request #37340 from cachedout/ill_kill_3 
SIGILL -> SIGKILL in process test
 2016-10-31 21:50:10 +13:00
Mike Place
a6b7417fe9
SIGILL -> SIGKILL in process test 
Fairly sure this was a typo. cc: @s0undt3ch
 2016-10-31 20:54:42 +13:00
Mike Place
e0c4b34fff Merge pull request #37339 from cachedout/carbon 
Remove test
 2016-10-31 20:42:09 +13:00
Mike Place
534a21e8d6
Remove test 
I don't know why this would exist in a client test. This is tested extensively
already in the loader tests, which is the appropriate place.
 2016-10-31 20:39:34 +13:00
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
Nicole Thomas
5f9daffc63 Merge pull request #37308 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-28 11:47:27 -06:00
rallytime
0df3feec3c Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-28 09:25:00 -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
63ba6b03ad Merge pull request #37301 from cachedout/fix_pkg_test 
Fix typo in pkg upgrade test
 2016-10-28 20:24:30 +09:00
Mike Place
6cb7ce2c0f
Fix typo in pkg upgrade test 2016-10-28 20:23:26 +09:00
Mike Place
7aa8381367 Merge pull request #37289 from cachedout/tar_thin_check 
Be more careful about checking existence in thin creation
 2016-10-28 15:47:08 +09:00
Mike Place
00ec2b817c
Be more careful about checking existence in thin creation 2016-10-28 15:46:15 +09:00
Mike Place
3b1e2f1839 Merge pull request #37288 from cachedout/fix_extend_test_2 
Reset dir for extend test
 2016-10-28 15:03:07 +09:00
Mike Place
36f47a4449
Reset dir for extend test 2016-10-28 15:02:13 +09: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
Mike Place
d7b41e11f7 Merge pull request #37284 from rallytime/versionadded-tags-update 
Carbon branch versionadded tags updated to 2016.11.0
 2016-10-28 13:09:06 +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
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
Thomas S Hatch
8e52f425e4 add cpub to raet event for compat 2016-10-27 15:13:30 -06:00
rallytime
bd96648cc4 Update Carbon versionadded tags to 2016.11.0 in salt/* 2016-10-27 15:00:00 -06:00
rallytime
2a381c7e7a Update Carbon versionadded tags to 2016.11.0 in beacons/* 2016-10-27 12:43:43 -06:00
rallytime
008a1dbe23 Update Carbon versionadded tags to 2016.11.0 in cloud/* 2016-10-27 12:37:26 -06:00
rallytime
b262008603 Update Carbon versionadded tags to 2016.11.0 in grains/* 2016-10-27 12:35:53 -06:00
rallytime
0e1d765793 Update Carbon versionadded tags to 2016.11.0 in beacons/* 2016-10-27 12:35:29 -06:00
rallytime
394c4790bd Update Carbon versionadded tags to 2016.11.0 in fileserver/* 2016-10-27 12:34:10 -06:00
rallytime
052bc74524 Update Carbon versionadded tags to 2016.11.0 in modules/* 2016-10-27 12:27:18 -06:00
rallytime
9d05057dd5 Update Carbon versionadded tags to 2016.11.0 in netapi/* 2016-10-27 11:07:10 -06:00
rallytime
c681df2033 Update Carbon versionadded tags to 2016.11.0 in pillar/* 2016-10-27 11:06:26 -06:00
rallytime
44dbe60184 Update Carbon versionadded tags to 2016.11.0 in proxy/* 2016-10-27 11:02:34 -06:00
rallytime
9d58360f16 Update Carbon versionadded tags to 2016.11.0 in returners/* 2016-10-27 10:58:13 -06:00
rallytime
85d2145fe6 Update Carbon versionadded tags to 2016.11.0 in runners/* 2016-10-27 10:40:01 -06:00
rallytime
ec8bb4d54d Update Carbon versionadded tags to 2016.11.0 in sdb/* 2016-10-27 10:37:24 -06:00
rallytime
1e28877048 Update Carbon versionadded tags to 2016.11.0 in states/* 2016-10-27 10:36:35 -06:00
Justin Findlay
a2eae208c5 update 2016.3.4 release notes (#37278) 2016-10-27 10:18:18 -06:00
rallytime
f2fc207d4f Update Carbon versionadded tags to 2016.11.0 in thorium files 2016-10-27 10:11:58 -06:00
rallytime
85292225e4 Update Carbon versionadded tags to 2016.11.0 in utils/* 2016-10-27 10:08:15 -06:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
Mike Place
8cb415026d Merge pull request #36983 from twangboy/win_powershell 
Create win_powershell utility
 2016-10-27 15:36:06 +09:00