[ARVADOS] updated: 319cc7b3862ff831798f92bcb2f0c921d208147d

[git at public.curoverse.com]

Summary of changes:
 .../app/helpers/pipeline_instances_helper.rb       |   2 +-
 .../pipeline_instances/_show_components.html.erb   |  50 +++++-----
 .../tutorial-firstscript.html.textile.liquid       |  10 +-
 .../main/java/org/arvados/sdk/java/Arvados.java    | 111 +++++++++++++++------
 .../java/org/arvados/sdk/java/ArvadosTest.java     |  72 ++++++++++---
 services/api/script/crunch-dispatch.rb             |  26 +++--
 6 files changed, 186 insertions(+), 85 deletions(-)

       via  319cc7b3862ff831798f92bcb2f0c921d208147d (commit)
       via  7199f034c15930a3a733e526e12fa93df7f9d4fb (commit)
       via  a5f005b1b1175771ea708daee632a76f502eb9e6 (commit)
       via  fba94dcc012a22c48b2b3b3bc9b0e134d605e725 (commit)
       via  7c810a0a2ad922e1bf966c026a96327c03ded77f (commit)
       via  30228998e995720e4c2e1a3f0b52be231d9fbb9a (commit)
       via  7ca1a382f7c59e29a03c765a6542f95a31ecdd07 (commit)
       via  1113b89204db5201806d03ecedaa99f177a91a2d (commit)
       via  facb17a2885e6b6d3e998e15862a3c6e970e8cf1 (commit)
       via  f60b9d7057fef32a7b61ea4de55b3d95b5b28f6c (commit)
       via  037ec427df8bb32953f5158d0cd9d074ace776e8 (commit)
       via  8e60aa5c834a1a2a741a87a8155b8db9b4c46da3 (commit)
       via  39e38f830e8a12c93d5a788d15a5834b6f911217 (commit)
       via  8efba7f42f882b2126a15e1bbcf385a5ab207b11 (commit)
       via  49a6ced3c7a540a7da7155ab1c3120a5227c620c (commit)
       via  a84be631958ac0bb45b5e06efdb2782f02fdb2af (commit)
       via  465b105b0282efcdd63d88e1fb4e2eae11a195bc (commit)
       via  9e0031c0bf48acdb76118ee643290d97a94926de (commit)
       via  a8ebe9f478e897334af0fcda79704de77c4dcea6 (commit)
       via  264b0a629a67888a9d982b3a4398c0e0e4119089 (commit)
      from  93901e794e11dbb5717288b006714fac7d13cb21 (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 319cc7b3862ff831798f92bcb2f0c921d208147d
Merge: 93901e7 7199f03
Author: radhika <radhika at curoverse.com>
Date:   Tue May 27 16:20:57 2014 -0400

    Merge branch '2756-eventbus-in-workbench' into 2678-owned_by
    
    Conflicts:
    	services/api/script/crunch-dispatch.rb

diff --cc services/api/script/crunch-dispatch.rb
index 88ed689,c8d97d9..a9b7598
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@@ -391,13 -397,13 +397,14 @@@ class Dispatche
  
    # send message to log table. we want these records to be transient
    def write_log running_job
-       if (running_job && running_job[:stderr_buf] != '')
+     begin
+       if (running_job && running_job[:stderr_buf_to_flush] != '')
          log = Log.new(object_uuid: running_job[:job].uuid,
                        event_type: 'stderr',
 +                      owner_uuid: running_job[:job].owner_uuid,
-                       properties: {"text" => running_job[:stderr_buf]})
+                       properties: {"text" => running_job[:stderr_buf_to_flush]})
          log.save!
-         running_job[:stderr_buf] = ''
+         running_job[:stderr_buf_to_flush] = ''
          running_job[:stderr_flushed_at] = Time.now.to_i
        end
      rescue

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


hooks/post-receive
--