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
35,820 Commits 24 Branches 182 Tags 341 MiB
f808cc88c5
Commit Graph

35820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
f808cc88c5 Merge pull request #16343 from jacksontj/2014.7 
This is not caught in the event system, so this causes major issues
 2014-10-02 21:32:47 -06:00
Thomas Jackson
5e212696ef This is not caught in the event system, so this causes major issues 
Revert "The exception is properly caught inthe event system now"

This reverts commit 4502019340.
 2014-10-02 19:35:15 -07:00
Thomas S Hatch
82dad40dfa Merge pull request #16336 from thatch45/lint_runner 
Lint fix the test runner
 2014-10-02 17:24:06 -06:00
Thomas S Hatch
bba1cc2c17 import print function 2014-10-02 16:03:31 -06:00
Colton Myers
0ffec8f6d3 Merge pull request #16327 from basepi/bp-16322 
Backport #16322 to 2014.7
 2014-10-02 15:33:45 -06:00
Thomas S Hatch
037e369df7 Lint fix the test runner 2014-10-02 15:17:06 -06:00
Thomas S Hatch
1eecd18208 Merge pull request #16335 from thatch45/lint 
remove hashlib imports since we moved to the utils function
 2014-10-02 14:33:11 -06:00
Thomas S Hatch
505b2e476d Merge pull request #16331 from whiteinge/wrap-runner-master_call 
Fix the call to RunnerClient().master_call()
 2014-10-02 14:28:39 -06:00
Thomas S Hatch
8518ff10d6 remove hashlib imports since we moved to the utils function 2014-10-02 14:24:12 -06:00
Thomas S Hatch
b5e885362f Merge pull request #16334 from thatch45/outputters_fix 
Fix the outputters, broken by @jacksontj
 2014-10-02 14:19:00 -06:00
Thomas S Hatch
c5c35e2a7a Fix the outputters, broken by @jacksontj 2014-10-02 14:01:49 -06:00
Colton Myers
0edf446903 Remove unused imports 2014-10-02 13:52:24 -06:00
Seth House
1c9d642f34 Revert "send entire load to RunnerClient.async" 
This is a precautionary revert to avoid unintended side effects.

This reverts commit 2ae993ac24.
 2014-10-02 13:32:58 -06:00
Seth House
5a676cecfa Reformat the low data that is passed to RunnerClient's master_call 
Closes #15218
 2014-10-02 13:30:40 -06:00
Nicole Thomas
c5522bf558 Merge pull request #16329 from basepi/bp-16311 
Backport #16311 to 2014.7
 2014-10-02 13:09:36 -06:00
Seth House
dbe2fe5c92 Added unit test for running arguments through the RunnerClient 2014-10-02 12:00:01 -06:00
Nicole Thomas
8c0504c6a4 Merge pull request #16328 from basepi/bp-16325 
Backport #16325 to 2014.7
 2014-10-02 11:46:34 -06:00
Seth House
6fd8615efa Added a test runner module 2014-10-02 11:28:03 -06:00
Thomas S Hatch
4502019340 The exception is properly caught inthe event system now 2014-10-02 11:21:35 -06:00
Thomas S Hatch
a731b97737 gate zmq! 2014-10-02 11:01:53 -06:00
Cimarron Mittelsteadt
9c8b089d2e STY: Added indices for str.format to correct for pylint 2014-10-02 10:44:27 -06:00
Cimarron Mittelsteadt
018af62638 BUG: Fix bug in _run where it uses python_shell boolean in Popen but the cmd is not formatted to handle shell (single string) vs. non-shell (list of strings) 2014-10-02 10:44:27 -06:00
Thomas S Hatch
566ee32e8a Merge pull request #16302 from s0undt3ch/features/ssh-packaging 
Move the SSH checks out of the windows checks
 2014-10-02 10:36:50 -06:00
Tarjei Husøy (via Travis CI)
82d7a5d4e7 Use salt.utils.get_hash for hashing 
Prevents memory errors for large files since get_hash uses chunked
hashing.
 2014-10-02 10:21:30 -06:00
Tarjei Husøy (via Travis CI)
25ea6060b7 Replace random.randint() with os.urandom() 2014-10-02 10:20:20 -06:00
Thomas S Hatch
ce3ee8bafd Merge pull request #16303 from cachedout/issue_16283 
Don't send pillar render exception to minion
 2014-10-02 10:16:41 -06:00
Thomas S Hatch
22f6d063f6 Merge pull request #16309 from cro/saltapi_fix 
send load to RunnerClient.async instead of kwarg
 2014-10-01 22:26:58 -06:00
C. R. Oldham
2ae993ac24 send entire load to RunnerClient.async 2014-10-01 21:18:23 -06:00
Pedro Algarvio
6fbcf1eb61 Merge pull request #16304 from rallytime/fix_5110 
Add pylint disables to ext_pillar function args
 2014-10-02 00:33:40 +01:00
Thomas S Hatch
33a4d0519e Merge pull request #16300 from thatch45/cachedout-issue_15195 
Merge #16295
 2014-10-01 16:10:39 -06:00
rallytime
203f7ab426 Add pylint disables to ext_pillar function args 
Fixes #5110
 2014-10-01 16:10:00 -06:00
Mike Place
82dd19f00b Don't send pillar render exception to minion 
Refs #16283
 2014-10-01 16:07:24 -06:00
Pedro Algarvio
4df44783ed Move the SSH checks out of the windows checks 2014-10-01 22:57:39 +01:00
Thomas S Hatch
c90b7b0a9e Merge pull request #16298 from s0undt3ch/features/ssh-packaging 
Allow packaging salt-ssh as a package.
 2014-10-01 15:08:08 -06:00
Thomas S Hatch
ecf2e560d8 lint 2014-10-01 15:04:31 -06:00
Thomas S Hatch
0340e41ccf Merge branch 'issue_15195' of https://github.com/cachedout/salt into cachedout-issue_15195 2014-10-01 15:03:01 -06:00
Pedro Algarvio
c081844c22 Add salt-call to the available scripts and allow packaging with setuptools 2014-10-01 21:39:37 +01:00
Pedro Algarvio
5afb59090d Also include salt-run in the packaged scripts 2014-10-01 21:00:10 +01:00
Pedro Algarvio
ec09c5b837 Allow packaging salt-ssh as a package. 
This works by passing `--ssh-packaging` to the `sdist` command

```
python setup.py sdist --ssh-packaging
```
 2014-10-01 20:49:36 +01:00
Thomas S Hatch
7eb9ed9fb4 Merge pull request #16282 from thatch45/2014.7 
Set the required msgpack to be above 0.3
 2014-10-01 13:16:24 -06:00
Mike Place
dd4e6ff604 Handle None passwords in mysql connect 
Closes #15195
 2014-10-01 11:54:43 -06:00
Nicole Thomas
f6cce07ebd Merge pull request #16287 from rallytime/fix_pylint 
Fix pylint on 2014.7 again
 2014-10-01 09:48:16 -06:00
rallytime
af9f440718 Fix a few pylints that I missed the first time 2014-10-01 09:05:23 -06:00
rallytime
d478feacf8 Fix pylint on 2014.7 again 2014-09-30 16:48:34 -06:00
Thomas S Hatch
acbf910d99 Merge pull request #16279 from thatch45/msgpack_gates 
Fix for #16088
 2014-09-30 16:25:21 -06:00
Thomas S Hatch
37267f76b9 Merge pull request #16276 from jacksontj/2014.7 
Ensure that timeout will happen for jobs that don't target any alive minions
 2014-09-30 16:24:19 -06:00
Thomas S Hatch
b9c33060a5 Merge pull request #16269 from bbinet/influxdb-admin-user 
Influxdb admin user
 2014-09-30 14:33:16 -06:00
Thomas S Hatch
dd66b9c855 lint 2014-09-30 14:29:30 -06:00
Nicole Thomas
de50067a91 Merge pull request #16272 from rallytime/bp-16252 
Backport #16252 to 2014.7
 2014-09-30 14:15:30 -06:00
Thomas S Hatch
52f59de09b Merge pull request #16278 from rallytime/pylinting 
Fix pylint on 2014.7
 2014-09-30 13:57:10 -06:00