Commit Graph

36062 Commits

Author SHA1 Message Date
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
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
Samuel M Smith
ef6dc12fc2 fix worker bug 2014-10-02 13:58:33 -06:00
Colton Myers
0edf446903 Remove unused imports 2014-10-02 13:52:24 -06:00
rallytime
b6075c7425 Add intalling from testing section to fedora installation docs 2014-10-02 13:44:22 -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