[ARVADOS] updated: 0510460e9c5ad8f3d8cf20aa9428115e43284659

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/application.js          |    3 +-
 .../app/controllers/actions_controller.rb          |    2 -
 .../app/controllers/collections_controller.rb      |   14 +-
 apps/workbench/app/controllers/users_controller.rb |    3 -
 apps/workbench/app/models/arvados_base.rb          |    6 +-
 apps/workbench/app/models/link.rb                  |    2 +-
 doc/admin/cheat_sheet.html.textile.liquid          |    4 -
 doc/api/schema/Link.html.textile.liquid            |    2 -
 doc/api/schema/Log.html.textile.liquid             |    1 -
 .../create-standard-objects.html.textile.liquid    |    2 -
 .../tutorial-trait-search.html.textile.liquid      |   18 +-
 services/api/Gemfile                               |    2 +-
 services/api/Gemfile.lock                          |    5 +-
 .../api/app/controllers/application_controller.rb  |   39 +++--
 .../arvados/v1/collections_controller.rb           |    7 -
 .../app/controllers/arvados/v1/jobs_controller.rb  |    2 +-
 .../arvados/v1/keep_disks_controller.rb            |   15 +-
 .../app/controllers/arvados/v1/links_controller.rb |   57 ++++++-
 .../app/controllers/arvados/v1/logs_controller.rb  |   32 ++++
 .../app/controllers/arvados/v1/nodes_controller.rb |   25 ++--
 .../arvados/v1/repositories_controller.rb          |    2 +-
 .../arvados/v1/user_agreements_controller.rb       |   26 ++--
 .../app/controllers/arvados/v1/users_controller.rb |   15 +-
 .../app/controllers/user_sessions_controller.rb    |   10 +-
 services/api/app/models/arvados_model.rb           |  101 ++++++++---
 services/api/app/models/collection.rb              |    4 +
 services/api/app/models/job.rb                     |    4 +
 services/api/app/models/keep_disk.rb               |    6 +-
 services/api/app/models/link.rb                    |   24 ++-
 services/api/app/models/log.rb                     |   15 ++-
 services/api/app/models/user.rb                    |   32 +---
 .../migrate/20140325175653_remove_kind_columns.rb  |   27 +++
 services/api/db/schema.rb                          |   40 ++---
 services/api/lib/kind_and_etag.rb                  |    5 +-
 services/api/test/fixtures/groups.yml              |    6 +
 services/api/test/fixtures/links.yml               |   40 ----
 services/api/test/fixtures/logs.yml                |    3 +
 services/api/test/fixtures/virtual_machines.yml    |    5 +
 .../functional/arvados/v1/links_controller_test.rb |  187 +++++++++++++++++++-
 .../functional/arvados/v1/logs_controller_test.rb  |   27 +++
 .../functional/arvados/v1/users_controller_test.rb |   34 ++--
 services/api/test/integration/permissions_test.rb  |   18 --
 services/api/test/integration/valid_links_test.rb  |   39 ++++
 services/api/test/unit/log_test.rb                 |    1 -
 services/api/test/unit/user_test.rb                |   44 +++---
 45 files changed, 657 insertions(+), 299 deletions(-)
 create mode 100644 services/api/db/migrate/20140325175653_remove_kind_columns.rb
 create mode 100644 services/api/test/fixtures/logs.yml
 create mode 100644 services/api/test/integration/valid_links_test.rb

       via  0510460e9c5ad8f3d8cf20aa9428115e43284659 (commit)
       via  97279656db75b9b7f8282e3b98774a60935d39f3 (commit)
       via  065620721d198894d80f5d3ed409a1d158f0f41b (commit)
       via  6a210c4771acb18751e48f7e7c0841eb68469d90 (commit)
       via  f580cf6d3d86f6591e68b4501279fc45cbf847e0 (commit)
       via  bd11c0a9ff6ce23f0992af11d7dc7aef32860e22 (commit)
       via  4c7323ea090e7570f962d821fa24c3ab20308e1e (commit)
       via  cc5023d40182e503e8ba109fc86e09efd6337836 (commit)
       via  4f552c0187f8c31d94ff74485c57ef7f9888597e (commit)
       via  4177bcc9b935391630c874a2abcedb81efa350f0 (commit)
       via  d334bf63821506a63afddb24c28ba86896958b03 (commit)
       via  3da41130c997f36f462feb1b34efbec53697d91e (commit)
       via  f60df78aec5cdc02ad50661f41a7d422e63742fc (commit)
       via  ff5f11f345307397d3d817f2bdef398d1660c22d (commit)
       via  de298e4e20a7ed07e16ed3cac87a18a66c0ceb83 (commit)
       via  417ff385d9e6bf111ebb1d5889c2081977dfe955 (commit)
       via  d1396b9eee6a939f5c675d5922d3708392d04936 (commit)
      from  bdb591e730fffb6aba7c01d93528c59da91b05b0 (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 0510460e9c5ad8f3d8cf20aa9428115e43284659
Merge: bdb591e 9727965
Author: Tim Pierce <twp at curoverse.com>
Date:   Mon Apr 14 15:23:04 2014 -0400

    Merge branch 'master' into 2449-keep-write-blocks


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


hooks/post-receive
--