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,873 Commits 24 Branches 182 Tags 341 MiB
1c7b437a4a
Commit Graph

35873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
1c7b437a4a Merge pull request #16387 from terminalmage/bp-16386 
Backport #16386 to 2014.7
 2014-10-06 10:32:28 -06:00
Thomas S Hatch
c364345560 Merge pull request #16375 from bechtoldt/debian_ip_whitespacing 
fixing whitespacing bug in a debian_ip template
 2014-10-06 10:26:03 -06:00
Thomas S Hatch
2551ea2c56 Merge pull request #16359 from whiteinge/rest_cherrypy-expire-response 
Add a setting to prevent CherryPy from expiring HTTP responses
 2014-10-06 10:19:22 -06:00
Erik Johnson
7efd690e33 Replace backslash-quote with raw string formatting 2014-10-04 20:47:39 -05:00
Georges Racinet
23bae10679 Issue #16384: avoid lspci warnings on OpenVZ containers 
I did not dare to shuffle things around in the huge _virtual() method.
Instead, logging gets postponed, and upon detection of 'virtual:openvzve',
failures for lspci and dmidecode get discarded
 2014-10-04 20:47:13 -05:00
Arnold Bechtoldt
eacad9a312 fixing whitespacing bug in debian_ip template 2014-10-04 01:14:42 +02:00
Thomas S Hatch
c20de1e6c1 Merge pull request #16361 from rallytime/bp-15584 
Backport #15584 to 2014.7
 2014-10-03 14:51:09 -06:00
Colton Myers
8836651af2 Merge pull request #16367 from basepi/stateslsdocs 
SLS files are not state "modules"
 2014-10-03 14:32:28 -06:00
Colton Myers
af74234862 SLS files are not state "modules" 2014-10-03 14:30:42 -06:00
Thomas S Hatch
ffed07cb8a clear out print statements 2014-10-03 14:09:16 -06:00
Thomas S Hatch
d016743c4f Add check for ssh-packaging 2014-10-03 13:55:32 -06:00
rallytime
167a75e0a0 Add ret dictionary 2014-10-03 13:42:22 -06:00
Mike Place
1975043730 Merge pull request #16332 from rallytime/fedora_docs 
Add intalling from testing section to fedora installation docs
 2014-10-03 13:06:27 -06:00
Mathieu Le Marec - Pasquet
3099d9c3d5 Simple copies 2014-10-03 12:59:19 -06:00
Mathieu Le Marec - Pasquet
da6d692e4e Fix interactivity in aptpkg 2014-10-03 12:59:18 -06:00
Mike Place
f23c791a8e Merge pull request #16360 from cro/fc_systemd_warning7 
Add warning for FC19 users
 2014-10-03 12:54:30 -06:00
C. R. Oldham
3fef918352 Add warning for FC19 users. 2014-10-03 12:52:46 -06:00
Thomas S Hatch
7001e20441 Merge pull request #16358 from cachedout/gate_minion_cache 
Flag to preserve minion cache on key delete
 2014-10-03 12:26:10 -06:00
Thomas S Hatch
b213c5b9c0 Merge pull request #16353 from cachedout/data_p_ssh 
Use unique name for data.p in salt-ssh
 2014-10-03 12:25:33 -06:00
Seth House
b7022ab8c0 Add a setting to prevent CherryPy from expiring HTTP responses 
Closes saltstack/salt-api#159
 2014-10-03 12:09:11 -06:00
Mike Place
5f2103903d Flag to preserve minion cache on key delete 
Refs #15673
 2014-10-03 11:43:33 -06:00
Mike Place
7093cb5f4d Use unique name for data.p in salt-ssh 2014-10-03 10:34:00 -06:00
Thomas S Hatch
6872b8e0d1 Merge pull request #16351 from thatch45/SmithSamuelM-2014.7_sam6 
Merge #16338
 2014-10-03 10:09:34 -06:00
Thomas S Hatch
9cd335fb21 Merge pull request #16352 from thatch45/bp-requests_fix 
Download files in chunks
 2014-10-03 10:03:12 -06:00
Tarjei Husøy
a6bce6e73e Download files in chunks 
Prevents out-of-memory errors when downloading large files.
 2014-10-03 10:00:36 -06:00
Thomas S Hatch
d2fc43c1db lint fixes for #16338 2014-10-03 09:56:46 -06:00
Thomas S Hatch
d626af352b Merge branch '2014.7_sam6' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam6 2014-10-03 09:54:04 -06:00
Thomas S Hatch
e41c5c2f52 Merge pull request #16342 from whiteinge/wildcard-eauth-check 
Removed duplicate eauth name checks
 2014-10-03 00:14:44 -06:00
Thomas S Hatch
34cb47c7b3 Merge pull request #16344 from thatch45/gate_zmq 
gate the zmq call
 2014-10-03 00:09:23 -06:00
Thomas S Hatch
bcc9037ec2 fix lint 2014-10-03 00:08:57 -06:00
Seth House
0d07099444 Added integration tests for wildcard eauth usernames 2014-10-02 23:53:37 -06:00
Thomas S Hatch
ebfc785b73 gate the zmq call 
sorry @jacksontj, I thought we had meged some other code here,
this should fix it correctly
 2014-10-02 21:52:18 -06:00
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
Seth House
a5d861314b Added a wildcard eauth user for testing 2014-10-02 19:21:51 -06:00
Seth House
dab89ec59c Remove duplicate external_auth dictionary lookup 
This performs the same lookup as the stanza on the next lines so we
don't need it (also it's missing the wildcard check).
 2014-10-02 19:21:51 -06:00
Seth House
aa7dbc0e63 Reformat runner_check() for readability 
This also matches the formatting for the identical call to wheel_check()
below.
 2014-10-02 19:21:51 -06:00
Samuel M Smith
dcf848de53 Added namedtuple for application kinds 
start on naming estates with names derived from role and kind
 2014-10-02 17:45:54 -06: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
Samuel M Smith
57c81998ad Refactor uxd_stack to lane_stack so not tied to transport as per windows uses different transport 2014-10-02 16:14:28 -06:00
Samuel M Smith
46f6f87c84 refactor udp_stack to road_stack so not necessarily tied to transport type 2014-10-02 16:10:28 -06:00
Samuel M Smith
d5ba67540f Fixed invalid yard value in pillar route 2014-10-02 16:03:38 -06:00
Thomas S Hatch
bba1cc2c17 import print function 2014-10-02 16:03:31 -06:00
Samuel M Smith
8c713a3d82 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam6 
Conflicts:
	salt/daemons/flo/worker.py
 2014-10-02 15:47:07 -06:00
Samuel M Smith
e95afca7c6 clarified variable name 2014-10-02 15:41:10 -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
Samuel M Smith
98e6e78372 Enabled minion scheduler in raet 2014-10-02 15:26:05 -06:00
Samuel M Smith
d45c07a170 fixed regression two shares named local in worker 2014-10-02 15:18:54 -06:00
Thomas S Hatch
037e369df7 Lint fix the test runner 2014-10-02 15:17:06 -06:00
Samuel M Smith
fc6dd45467 debugging 2014-10-02 14:39:01 -06:00