Commit Graph

74549 Commits

Author SHA1 Message Date
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
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
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26: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
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
Mike Place
9f5cdf1d49 Merge pull request #37193 from cro/allow_host_from_scratch
Allow VMs created from scratch to be assigned to a specific host
2016-10-27 15:33:10 +09:00
Mike Place
c0ca1a3e0d Merge pull request #37198 from t2b/issue-36587-v2
don't pull image in dockerng.running if test=true
2016-10-27 15:30:09 +09:00
Mike Place
170b5eb381 Merge pull request #37199 from t2b/cleanup-dockerng-v2
remove unnecessary call of _get_defaults_from_image
2016-10-27 15:28:06 +09:00
C. R. Oldham
338e3987f0 Merge pull request #37143 from rajvidhimar/feature-enhancements
Feature enhancements
2016-10-26 07:22:15 -06:00
Mike Place
fc0fb5cf0c Merge pull request #37246 from cachedout/2016_3_carbon
2016.3 -> carbon
2016-10-26 15:16:50 +09:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon 2016-10-26 14:08:03 +09:00
Mike Place
2010d41f47 Merge pull request #37229 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-10-26 14:05:26 +09:00
rallytime
409e48f26b Remove duplicate `destroy` function from minion.py
This was added during a merge forward from 2016.3 to carbon.
2016-10-25 20:56:20 -06: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
15ea1decda Merge pull request #37227 from jfindlay/init_kwargs
cloud.__init__: convert kwargs to dict before **
2016-10-26 10:17:22 +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
b8bd051ebb Merge pull request #37242 from dmurphy18/amzn_building
Refined rpm building natively on Amazon Linux
2016-10-26 10:11:15 +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
ttb
9e49010bc5 reraise CommandExecutionError of dockerng.inspect_image if not test=true 2016-10-25 23:53:16 +02:00
C. R. Oldham
6a7eab9e16 Remove this test, it is no longer illegal to leave out image
and clonefrom parameters.  It is possible to create a VM from scratch.
2016-10-25 15:23:32 -06:00
David Murphy
6bc1dfdeeb Refined rpm building natively on Amazon Linux 2016-10-25 14:26:55 -06:00
ttb
0ccd75338d be more specific in dockerng.runnning comment if test=true
a missing local image can also mean that a running container will be
replaced with one based on the new image
2016-10-25 21:40:17 +02: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
3c94315d35 Merge pull request #37233 from rallytime/bp-37154
Back-port #37154 to 2016.3
2016-10-25 12:32:56 -06:00