valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,527 Commits 24 Branches 182 Tags 341 MiB
f2fc207d4f
Commit Graph

74527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
bd58650af2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - tests/unit/netapi/rest_tornado/test_handlers.py
  - tests/utils/__init__.py
 2016-10-25 10:39:02 -06:00
rallytime
b99d6733b6 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-25 10:31:36 -06:00
Daniel Wallace
b96d74a517 remove duplicate work (#37225) 
Looks like there might have been an error in a merge forward here
 2016-10-25 09:48:39 -06:00
Justin Findlay
d41350dfd8 cloud.__init__: convert kwargs to dict before ** 2016-10-25 09:41:56 -06:00
Pedro Algarvio
af31f6c3d1 Merge pull request #37220 from meaksh/carbon-zypper-fix 
Fix Zypper module and tests for Carbon
 2016-10-25 11:40:48 +01: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
Pablo Suárez Hernández
32f44b43ee Fix Zypper module and tests for Carbon 2016-10-25 11:08:00 +01: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
f3e2148f94 Merge pull request #37210 from cachedout/fix_spm_merge_conflect 
Fix merge conflict in SPM
 2016-10-25 16:24:22 +09:00
Mike Place
f70c52b15c
Fix merge conflict in SPM 
Refs e3916813bb
 2016-10-25 16:23:33 +09:00
Mike Place
4ce16b7f7a Merge pull request #37209 from cachedout/3_carbon 
Merge 2016.3 to carbon
 2016-10-25 16:14:44 +09:00
Mike Place
0aab883180
Merge branch '2016.3' into 3_carbon 2016-10-25 16:13:44 +09:00