[ARVADOS] updated: 44e4d85c32d5e4ea4dc651570672e59d7a10d3b3

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb |  22 ++--
 apps/workbench/app/models/arvados_base.rb          |   2 +-
 .../app/views/users/_manage_repositories.html.erb  |   5 +-
 .../test/functional/users_controller_test.rb       |  11 ++
 doc/api/methods/nodes.html.textile.liquid          |   2 +
 doc/api/schema/Job.html.textile.liquid             |   1 +
 doc/api/schema/Node.html.textile.liquid            |   1 +
 .../app/controllers/arvados/v1/nodes_controller.rb |  18 ++++
 services/api/app/models/arvados_model.rb           |   7 --
 services/api/app/models/job.rb                     |   6 ++
 services/api/app/models/node.rb                    |  11 ++
 .../20140924091559_add_job_uuid_to_nodes.rb        |  13 +++
 services/api/db/structure.sql                      |   9 +-
 services/api/script/crunch-dispatch.rb             |  81 +++++++-------
 services/api/script/update_node_attributes.rb      | 106 ------------------
 services/api/test/fixtures/links.yml               |  14 +++
 services/api/test/fixtures/nodes.yml               |   4 +
 services/api/test/fixtures/repositories.yml        |   5 +
 .../functional/arvados/v1/jobs_controller_test.rb  |   6 ++
 .../functional/arvados/v1/nodes_controller_test.rb |  72 +++++++++++++
 services/api/test/unit/permission_test.rb          |  13 +++
 services/fuse/tests/test_mount.py                  |   2 +
 services/keepstore/handler_test.go                 | 120 +++++++++++++++++++--
 services/keepstore/handlers.go                     |  58 +++++++++-
 services/keepstore/keepstore.go                    |  14 ++-
 25 files changed, 418 insertions(+), 185 deletions(-)
 create mode 100644 services/api/db/migrate/20140924091559_add_job_uuid_to_nodes.rb
 delete mode 100755 services/api/script/update_node_attributes.rb

       via  44e4d85c32d5e4ea4dc651570672e59d7a10d3b3 (commit)
       via  8b4cd21c6bd056e4ebf7487132a454cb5b8aacc5 (commit)
       via  3154ba6b56adb7a76bd5665c6c4c3326efea8eaa (commit)
       via  409fe707a4d05f1986d7bb0c29ec977d19aa63f5 (commit)
       via  da0d61f9a95848d47d28462d89e0a2070c39d587 (commit)
       via  9340ba16925c4288e6de8a457b74ae9524b04213 (commit)
       via  e350e7a5a074d6666f60b0a1789dce8da3037d8f (commit)
       via  37404e821668b6b9b1952a0a5a3b28901835884b (commit)
       via  af09cce22f077b5a537e1b7eea8d98981de9f400 (commit)
       via  2832018a959557515bfad1f763bf8d4b72182fd6 (commit)
       via  1513d62bc0716698b71789f7affbf78e675cbff8 (commit)
       via  039e808b1be1f2106118dc20174977d8e8766125 (commit)
       via  2b6f61a7d202b771be7e85c14fb4d1cb592142ec (commit)
       via  8934b505b0cdd6af699d910148046ede7c44b7da (commit)
       via  cbd11b4bfd5bcc637abe0e7678239dd1e7a2fbd2 (commit)
      from  b0fa2109b62079c50c5228d227c591fde7b40ab7 (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 44e4d85c32d5e4ea4dc651570672e59d7a10d3b3
Merge: 8b4cd21 3154ba6
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 24 20:15:51 2014 -0400

    Merge branch 'master' into 3836-remove-collection-from-project-bug


commit 8b4cd21c6bd056e4ebf7487132a454cb5b8aacc5
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 24 20:14:40 2014 -0400

    3836: update the fuse test to expect the newly added collections.

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index a1f7d4b..4af3467 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -262,6 +262,7 @@ class FuseSharedTest(MountTestBase):
                           "Pipeline Template with Input Parameter with Search.pipelineTemplate",
                           "Pipeline Template with Jobspec Components.pipelineTemplate",
                           "collection_expires_in_future",
+                          "collection_with_same_name_in_aproject_and_home_project",
                           "pipeline_with_job.pipelineInstance"
                       ], d2)
 
@@ -270,6 +271,7 @@ class FuseSharedTest(MountTestBase):
         self.assertEqual(["A Subproject",
                           "Two Part Pipeline Template.pipelineTemplate",
                           "collection_to_move_around",
+                          "collection_with_same_name_in_aproject_and_home_project",
                           "zzzzz-4zz18-fy296fx3hot09f7 added sometime"
                       ], d3)
 

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


hooks/post-receive
--