[ARVADOS] updated: 7a6f2613d38bf9fb99a919b3875d2851a23a253a

git at public.curoverse.com git at public.curoverse.com
Thu Oct 16 11:09:55 EDT 2014


Summary of changes:
 .../test/functional/collections_controller_test.rb |   9 +
 apps/workbench/test/integration/projects_test.rb   |   6 +-
 .../_includes/_tutorial_submit_job.liquid          |  11 +-
 .../running-external-program.html.textile.liquid   |  10 +-
 .../tutorial-new-pipeline.html.textile.liquid      |  27 ---
 .../tutorial-submit-job.html.textile.liquid        |  38 +---
 sdk/cli/bin/arv                                    | 245 +++++++++++++++------
 sdk/cli/bin/arv-run-pipeline-instance              |   6 +-
 sdk/python/arvados/commands/keepdocker.py          |   3 +-
 services/api/Gemfile                               |   2 +-
 services/api/Gemfile.lock                          |   8 +-
 services/api/app/models/arvados_model.rb           |   1 -
 services/api/app/models/log.rb                     |   5 +
 services/api/config/initializers/eventbus.rb       |   3 +
 services/api/lib/eventbus.rb                       |  33 ++-
 services/api/test/integration/websocket_test.rb    |  36 +++
 services/keepstore/handler_test.go                 | 113 +++-------
 services/keepstore/handlers.go                     |  17 +-
 services/nodemanager/README.rst                    |   6 +-
 services/nodemanager/tests/__init__.py             |  11 +-
 services/nodemanager/tests/test_clientactor.py     |  49 ++---
 services/nodemanager/tests/test_computenode.py     |  74 ++++---
 services/nodemanager/tests/test_daemon.py          |  93 ++++----
 services/nodemanager/tests/test_jobqueue.py        |   4 +-
 services/nodemanager/tests/test_nodelist.py        |   9 +-
 services/nodemanager/tests/test_timedcallback.py   |  42 ++--
 services/nodemanager/tests/testutil.py             |  16 +-
 27 files changed, 498 insertions(+), 379 deletions(-)
 copy sdk/java/src/test/resources/first_pipeline.json => doc/_includes/_tutorial_submit_job.liquid (61%)
 delete mode 100644 doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid

       via  7a6f2613d38bf9fb99a919b3875d2851a23a253a (commit)
       via  6f7456f84209e9bf5955ba4158c4ce673d876be0 (commit)
       via  69441aa2a477099731f36f6e7995fc2ec85c8c86 (commit)
       via  adbea418d67bfe3b30a305c43d22b858d5a81e92 (commit)
       via  8cfc0583424956ca6b2a3f1f2efcf751e185aa3a (commit)
       via  adb949d39f83b47e1a3cd48a75ec2c6713381cd9 (commit)
       via  286f418347570794d15ae26f9c66fd7362c25848 (commit)
       via  d7f9b8fdb408df9d0dc1d2e9d2dca8b57b6f1365 (commit)
       via  61790a81094b7a21109c8607a11ad874d5aecd73 (commit)
       via  0474aa89b8f497fd5abaa072f9bc501742cc5b42 (commit)
       via  d9eca6c665e600063cb2c04b17f38d540eb438f1 (commit)
       via  9b50fd83c23a75ef675f6186e9a1d0be511730c9 (commit)
       via  d13e0b26fef4777842d92ad3c050d6a662823201 (commit)
       via  b8fdb9089b0ed5213d7b8d8262b65558539fa054 (commit)
       via  6bdfed00c27c6034ffe4ad79a05bc9cadd9b9489 (commit)
       via  38ba0794f37ce5324a246a9ca5c0ac81e281e0da (commit)
       via  704cf4edf9c1f9ff3403a72b383750aaa04a0dfb (commit)
       via  c088fcf0b5aaf31195ec1b94873e93f1fd3ee8ed (commit)
       via  67f00f6ddc4570f878fcc64d4bbdc3eb198a48a3 (commit)
       via  4fe672034a740836e930733d741017d07f6ffa0c (commit)
       via  585fb54b7f76fce5880eba94e05ea45c7c89f980 (commit)
       via  6ce66b16c069c6176dca37bbdc275cb286a08dab (commit)
       via  9dd2519aa44d751e6f0144226058dc5a98e4bcb5 (commit)
       via  3d0cb4307773c5cba2af35fe4eff49fde7f224cc (commit)
      from  61f351e9e3542308fe0a41fa7f41e4de85130c24 (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 7a6f2613d38bf9fb99a919b3875d2851a23a253a
Merge: 6f7456f 69441aa
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 16 10:57:38 2014 -0400

    Merge branch 'master' into 4062-infinite-scroll-repeat-issue


commit 6f7456f84209e9bf5955ba4158c4ce673d876be0
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 16 10:54:55 2014 -0400

    4062: trailing white space

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index f0d612b..0ca0a78 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -527,7 +527,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
         collections_count = found_collections.count
 
         (0..collections_count-1).each do |i|
-          # Found row text would be of the format "Show Collection_#{n} " 
+          # Found row text would be of the format "Show Collection_#{n} "
           collection_name = found_collections[i].text.split[1]
           if !my_collections.include? collection_name
             unexpected_items << collection_name
@@ -539,7 +539,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
         assert_equal true, unexpected_items.empty?, "Found unexpected items #{unexpected_items.inspect}"
         if amount > 200
           assert_equal 200, collections_count, "Found different number of collections"
-          assert_equal amount-200, verify_collections.length, "Did not find all the collections"  
+          assert_equal amount-200, verify_collections.length, "Did not find all the collections"
         else
           assert_equal amount, collections_count, "Found different number of collections"
           assert_equal true, verify_collections.empty?, "Did not find all the collections"
@@ -572,7 +572,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
         wait_for_ajax
       rescue
       end
-      
+
       verify_pipelines = my_pipelines.dup
       unexpected_items = []
       object_count = 0

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list