valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +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
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
Mike Place
ca78ffbfc2 Merge pull request #37184 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-25 16:11:37 +09:00
Mike Place
6767d5dcdb Remove repr flag from format 
Per pylint
 2016-10-25 16:11:08 +09:00
rajvidhimar
969f3a35a9 use salt utils for file handling 2016-10-25 12:12:48 +05:30
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
Mike Place
d608465d77 Merge pull request #37178 from isbm/isbm-fix-saltapi-ssh-crash 
Fix Salt-API ssh crash
 2016-10-25 13:51:50 +09:00
Mike Place
815dfd1c04 Merge pull request #37183 from gtmanfred/2016.3 
load tags should reference the actual load tags
 2016-10-25 13:38:00 +09:00
Mike Place
ca63376c97 Merge pull request #37188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-25 13:37:25 +09:00
Mike Place
c4393d5e9e
Address transport test hang 
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
 2016-10-25 13:16:35 +09:00
C. R. Oldham
c2b158af89 Extend timeout for createvm task and wrap PowerOn in a try/except. 2016-10-24 16:57:33 -06:00
ttb
b3f1a2f1d0 remove unnecessary call of _get_defaults_from_image 
defaults_from_image is unused at this point.
it's called later when it is needed
 2016-10-24 22:58:06 +02:00
ttb
3a565d280a don't pull image in dockerng.running if test=true 2016-10-24 21:47:02 +02:00
C. R. Oldham
ddf2f33894 Allow VMs created from scratch to be assigned to a specific host 2016-10-24 13:16:51 -06:00
rallytime
ccb664050d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-24 10:20:46 -06:00
twangboy
86b1e17c74 Put variable names back 2016-10-24 10:18:16 -06:00
rallytime
063ddfd7ce Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-24 10:16:17 -06:00
twangboy
9a29aabf09 Remove kwargs from documentation 2016-10-24 10:03:53 -06:00
twangboy
a19fd3b194 Fix bad var in if statement 2016-10-24 10:01:16 -06:00
twangboy
b9549fef10 Remove kwargs in favor of explicit parameter 2016-10-24 09:57:36 -06:00
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186) 
Refs #37175
 2016-10-24 09:42:41 -06:00
twangboy
7ebdb931f3 Remove print statement 2016-10-24 09:39:14 -06:00
twangboy
a5ad47bc1b Add additional paths 2016-10-24 09:39:14 -06:00
twangboy
58d3d703bb Add additional path handling, list option, fix docs 2016-10-24 09:39:14 -06:00
twangboy
43d9f2fcf4 Remove __virtual__ function 2016-10-24 09:39:14 -06:00
twangboy
42679101e2 Add get_modules function to win_powershell 
rename win_powershell to powershell
 2016-10-24 09:39:14 -06:00
twangboy
c8578062d5 Fix lint 2016-10-24 09:39:14 -06:00
twangboy
6ac987a608 Remove log entry 2016-10-24 09:39:14 -06:00
twangboy
aec081c301 Create win_powershell utility 2016-10-24 09:39:14 -06:00
rallytime
027e2212c9 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/status.py
  - salt/modules/win_status.py
  - salt/modules/zypper.py
  - salt/utils/network.py
  - tests/unit/transport/zeromq_test.py
 2016-10-24 09:29:53 -06:00
Daniel Wallace
1b7b4b1a0c load tags should reference the actual load tags 
Closes #37176
 2016-10-24 10:02:57 -05:00
Bo Maryniuk
28edda457e Do not prematurily raise an exception, let the main loop take care of it instead 2016-10-24 15:35:23 +02:00
Bo Maryniuk
372f2bbd93 Do not restart the whole thing if roster is not around 2016-10-24 15:35:13 +02:00
Bo Maryniuk
8d1450cc47 Fix PEP8 2016-10-24 15:35:03 +02:00
Bo Maryniuk
44da411c3a Do not prematurily raise an exception, let the main loop take care of it instead 2016-10-24 15:24:52 +02:00
Bo Maryniuk
ee48deeded Do not restart the whole thing if roster is not around 2016-10-24 15:24:09 +02:00
Bo Maryniuk
b8f4e46920 Fix PEP8 2016-10-24 15:23:48 +02:00
Mike Place
0d7af935e5 Merge pull request #37175 from cachedout/fix_test_hange 
Fix test hang
 2016-10-24 18:55:37 +09:00
Mike Place
0fecb5ff2e
Remove sleep. Thanks @s0undt3ch 2016-10-24 18:38:49 +09:00
Mike Place
cedc609503
Fix test suite hang on salt testing 
We don't need to clean up here since the test suite will handle it for us.
 2016-10-24 15:52:33 +09:00
Mike Place
b3e79dcd51 Merge pull request #37139 from awerner/fix-spm-download-remote-download 
Download spm package from remote repository and save it to cache
 2016-10-24 12:29:05 +09:00
Mike Place
1e97df7540 Merge pull request #37142 from DSRCorporation/bugs/36866_salt-minion_communication_broken 
status.master: don't fail if host_to_ips returns None
 2016-10-24 12:21:23 +09:00