[ARVADOS] updated: 62790d76daf181a457d8f47741721967cd9cb7d9

[git at public.curoverse.com]

Summary of changes:
 services/api/script/crunch-dispatch.rb | 82 +++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 37 deletions(-)

       via  62790d76daf181a457d8f47741721967cd9cb7d9 (commit)
       via  2935de4fbccf43b7daedb9412f2ada1bf65c52ab (commit)
       via  23acabd1c9685b0a30027a643ebc10b25d3985d3 (commit)
       via  a4679fb93b4b835509cc77f9bf2fdce02d40520e (commit)
       via  4f41341675c108e9ffa4e5ba15b8bca521152a67 (commit)
       via  74bcc470f33cd47ca4106a7565871c07c40f9c00 (commit)
      from  a8bd120b4b5056e7a688e6ce4a60c1251fe7cb0f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 62790d76daf181a457d8f47741721967cd9cb7d9
Merge: a8bd120 2935de4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 2 10:51:36 2014 -0400

    Merge branch '3052-crunch-log-stdout' closes #3052


commit 2935de4fbccf43b7daedb9412f2ada1bf65c52ab
Merge: 23acabd 5d006b9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 2 10:46:37 2014 -0400

    Merge branch 'master' into 3052-crunch-log-stdout


commit 23acabd1c9685b0a30027a643ebc10b25d3985d3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 2 10:46:23 2014 -0400

    3052: Change ruby style ruby style {:stderr => ''} to json style {stderr: ''}

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 8d94970..aa91d68 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -334,7 +334,7 @@ class Dispatcher
         stderr: e,
         wait_thr: t,
         job: job,
-        buf: {:stdout => '', :stderr => ''},
+        buf: {stderr: '', stdout: ''},
         started: false,
         sent_int: 0,
         job_auth: job_auth,

-----------------------------------------------------------------------


hooks/post-receive
--