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
36,886 Commits 24 Branches 182 Tags 341 MiB
9466dba1ce
Commit Graph

36886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
9466dba1ce Merge pull request #15835 from wesleylancel/digital-ocean-api-v2 
Add support for Digital Ocean's API v2
 2014-09-17 14:07:29 -06:00
Nicole Thomas
ce02ad59fd Merge pull request #15877 from s0undt3ch/develop 
Correct `--output-file-append` test
 2014-09-17 13:23:13 -06:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Nicole Thomas
95d2ee79d6 Merge pull request #15865 from techhat/issue15831 
Cleanup from issue #15831
 2014-09-17 08:36:49 -06:00
Joseph Hall
d398082de4 Cleanup from issue #15831 2014-09-17 07:59:02 -06:00
Joseph Hall
eaae71889d Merge pull request #15831 from ror6ax/devmap 
devmap module added
 2014-09-17 07:53:02 -06:00
Pedro Algarvio
32868c6561 Merge pull request #15858 from cvrebert/patch-1 
salt.output.nested: rm unused import of sys module
 2014-09-17 12:14:41 +01:00
Pedro Algarvio
edd364c781 Merge pull request #15859 from cvrebert/patch-2 
salt.utils.process: rm duplicate import of signal module
 2014-09-17 08:05:33 +01:00
Chris Rebert
59ada03b85 salt.utils.process: rm duplicate import of signal module 
************* Module salt.utils.process
salt/utils/process.py:9: [W0404(reimported), ] Reimport 'signal' (imported line 5)
 2014-09-16 23:15:36 -07:00
Chris Rebert
f19af1c786 salt.output.nested: rm unused import of sys module 
************* Module salt.output.nested
salt/output/nested.py:29: [W0611(unused-import), ] Unused import sys
 2014-09-16 23:13:51 -07:00
ror6ax
e550590ac5 lint fixes, docstring at beginning of the file 2014-09-17 06:59:26 +01:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
David Boucha
caccd64dc6 Merge pull request #15853 from terminalmage/buildpackage-el5 
Fix --define directive for Cent5 builds
 2014-09-16 17:21:14 -06:00
Erik Johnson
3f19d518fb Fix --define directive for Cent5 builds 2014-09-16 18:16:44 -05:00
Thomas S Hatch
c8b8cb3682 Merge pull request #15848 from cachedout/multimaster_opts 
Re-inject opts into modules under multi-master mode.
 2014-09-16 16:02:14 -06:00
Mike Place
e237179706 Re-inject opts into modules under multi-master mode. 2014-09-16 15:16:32 -06:00
Thomas S Hatch
4df1ba300c Merge pull request #15839 from jacksontj/develop 
Handle OSErrorin processmanager
 2014-09-16 15:05:07 -06:00
Thomas Jackson
e048935b70 An additional race condition in shutdown-- if the signal is sent to all children 2014-09-16 13:49:14 -07:00
Thomas S Hatch
de5c78ce9c Merge pull request #15843 from thatch45/ssh_version 
Add ssh version check
 2014-09-16 14:28:46 -06:00
Thomas Jackson
29110d0a92 Cleanup, the function name changed 2014-09-16 13:22:55 -07:00
Thomas Jackson
d31ee00522 Break on error, to avoid races and stuff 2014-09-16 13:16:20 -07:00
Thomas S Hatch
9849bf3dee Merge pull request #15841 from thatch45/random_audit 
Add some calls to systemrandom where it might be good to have a
 2014-09-16 13:55:49 -06:00
Colton Myers
8168230eab Merge pull request #15821 from rallytime/azure_cloud_tests 
Add Azure cloud provider tests
 2014-09-16 12:55:45 -06:00
Thomas S Hatch
12b9b52dcb Add some calls to systemrandom where it might be good to have a 
little better random data
 2014-09-16 12:37:49 -06:00
Thomas S Hatch
d1671943d7 Merge pull request #15840 from rallytime/fix_develop_tests 
Fix test failures on develop
 2014-09-16 12:30:38 -06:00
Thomas S Hatch
6e6a0ae420 Merge pull request #15838 from thatch45/random_fix 
Always use system random
 2014-09-16 12:24:40 -06:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
Thomas Jackson
cd965ffad1 Handle OSError, you will get this because the signal handler interrupts the systemcall to avoid traces like: 
```
Traceback (most recent call last):
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 232, in _bootstrap
    self.run()
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 88, in run
    self._target(*self._args, **self._kwargs)
  File "/home/thjackso/src/salt/salt/master.py", line 308, in run_reqserver
    reqserv.run()
  File "/home/thjackso/src/salt/salt/master.py", line 506, in run
    self.__bind()
  File "/home/thjackso/src/salt/salt/master.py", line 500, in __bind
    self.process_manager.run()
  File "/home/thjackso/src/salt/salt/utils/process.py", line 180, in run
    pid, exit_status = os.wait()
OSError: [Errno 4] Interrupted system call
```
 2014-09-16 11:17:30 -07:00
Thomas S Hatch
62b94b1e24 Always use system random 2014-09-16 11:43:25 -06:00
Thomas S Hatch
c85e889eb4 Add ssh version chgeck 2014-09-16 11:40:36 -06:00
Thomas S Hatch
b376633a3d Merge pull request #15826 from makinacorpus/b5 
Fix typo in salt call parsing
 2014-09-16 10:01:27 -06:00
Thomas S Hatch
a12a4af12e Merge pull request #15834 from nmadhok/doc-fix 
Doc fixes
 2014-09-16 09:59:47 -06:00
Thomas S Hatch
3cb1c6bca9 Merge pull request #15824 from hvnsweeting/develop 
remove duplicate entry, it was in advanced topics
 2014-09-16 09:59:28 -06:00
Thomas S Hatch
3d9a2e32e1 Merge pull request #15823 from garethgreenaway/fixing_gpg_verify 
fixes to gpg module
 2014-09-16 09:59:01 -06:00
Thomas S Hatch
bd13a90725 Merge pull request #15822 from jacksontj/develop 
Fix the publish command in syndics
 2014-09-16 09:58:44 -06:00
Pedro Algarvio
f2f9f2bbd4 Merge pull request #15820 from techhat/tracelog 
Changing log messages to trace level
 2014-09-16 16:55:11 +01:00
Thomas S Hatch
339d37a310 Merge pull request #15818 from jacksontj/2014.7 
A couple useful features that we should probably include
 2014-09-16 09:43:42 -06:00
Thomas S Hatch
5b15a5d6bb Merge pull request #15819 from s0undt3ch/hotfix/protect-from-older-libcloud 
Protect against older libcloud versions
 2014-09-16 09:43:05 -06:00
Thomas S Hatch
c23660960f Merge pull request #15815 from hulu/high-shadowing 
modules.state.template: avoid shadowing high() func
 2014-09-16 09:42:15 -06:00
Thomas S Hatch
66ac56a0e0 Merge pull request #15813 from terminalmage/issue13878 
Encode/Decode unicode characters in cmd.run states
 2014-09-16 09:41:58 -06:00
Wesley Lancel
407e48ae35 Add support for Digital Ocean's API v2 2014-09-16 17:16:14 +02:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file" 
This reverts commit 1ccec204b2.
 2014-09-16 08:40:43 -06:00
Nitin Madhok
23409a5117 More 2014-09-16 10:19:34 -04:00
Nitin Madhok
6acc5d5198 More 2014-09-16 10:01:50 -04:00
Nitin Madhok
72f3bf8c53 More doc fixes 2014-09-16 09:59:01 -04:00
Nitin Madhok
197df512bb Doc fixes 2014-09-16 09:54:52 -04:00
ror6ax
dbc081d909 function names changed as discussed in pull req 2014-09-16 14:34:14 +01:00
ror6ax
0e959af53c Merge remote-tracking branch 'origin/devmap' into devmap 
Conflicts:
	salt/modules/devmap.py
 2014-09-16 14:33:30 +01:00
ror6ax
6bfe517fae function names changed as discussed in pull req 2014-09-16 14:31:07 +01:00
ror6ax
ca120852ed function names changed as discussed in pull req 2014-09-16 14:29:41 +01:00