[ARVADOS] updated: 5d61e1d576fbf98b85d9e9ee8839e3049312a320

git at public.curoverse.com git at public.curoverse.com
Fri Jan 23 10:51:27 EST 2015


Summary of changes:
 sdk/cli/bin/crunch-job                             |  6 +++++-
 sdk/python/arvados/events.py                       |  4 +++-
 services/api/Gemfile                               |  3 ++-
 services/api/Gemfile.lock                          |  6 ++++--
 .../api/app/controllers/application_controller.rb  | 15 +++++++++++---
 .../arvados/v1/collections_controller.rb           |  6 +++---
 .../controllers/arvados/v1/groups_controller.rb    |  2 +-
 .../arvados/v1/keep_disks_controller.rb            |  2 +-
 .../app/controllers/arvados/v1/nodes_controller.rb |  2 +-
 .../arvados/v1/repositories_controller.rb          |  8 +++-----
 .../controllers/arvados/v1/schema_controller.rb    |  2 +-
 .../app/controllers/arvados/v1/users_controller.rb |  2 +-
 .../arvados/v1/virtual_machines_controller.rb      |  2 +-
 .../api/app/controllers/database_controller.rb     |  2 +-
 services/api/app/models/arvados_model.rb           | 10 ++++-----
 .../api/db/migrate/20141208185217_search_index.rb  | 10 ++++-----
 services/api/db/structure.sql                      | 10 ++++-----
 services/api/lib/josh_id.rb                        |  2 +-
 services/api/lib/kind_and_etag.rb                  |  4 ++--
 .../arvados/v1/collections_controller_test.rb      |  3 +++
 services/api/test/performance/browsing_test.rb     | 12 -----------
 services/api/test/performance/links_index_test.rb  | 14 +++++++++++++
 services/api/test/test_helper.rb                   |  2 +-
 services/api/test/unit/arvados_model_test.rb       |  2 +-
 services/api/test/unit/log_test.rb                 | 14 +++++++++++++
 .../arvnodeman/computenode/driver/gce.py           |  4 ++--
 services/nodemanager/arvnodeman/config.py          | 24 ++++++++++++++++++++--
 services/nodemanager/doc/gce.example.cfg           | 16 +++++++++------
 28 files changed, 124 insertions(+), 65 deletions(-)
 delete mode 100644 services/api/test/performance/browsing_test.rb
 create mode 100644 services/api/test/performance/links_index_test.rb

       via  5d61e1d576fbf98b85d9e9ee8839e3049312a320 (commit)
       via  ed6bd1772b009eff0aa3926f45db4a2a447dc40b (commit)
       via  1fae5d56406b1f6f713899392eb073c19b6e8023 (commit)
       via  5c1db683ce8a1192508fb6e84993b139252b7d60 (commit)
       via  224701a0e17975957d3fcc0262c50806e2a7698d (commit)
       via  261192400cbf11f2f21b200cf1ceb7779856f65f (commit)
       via  7c34347eed35a0713154cb19ff2dbb8b41f8e729 (commit)
       via  ef969ca8dabe571a9866a7b3b7c39098785022fa (commit)
       via  575443545936e6b8a1a4783e3d0e17d0246c6e99 (commit)
       via  ffcfb73e6a5dfd626b1d523accc42e7a6af5e8ed (commit)
       via  7eec2f46099c6bf913149a7d19c4903feb2bf835 (commit)
       via  9707b0c9304596799d01cf5c2d1d630026a49d79 (commit)
       via  47585fc714a92d26e008f2fe9a46357f5ad9070d (commit)
       via  691d642124e94bb1bc8f662497b00e6c39597fd8 (commit)
       via  1974e0e333395ee3eccedc2410441a7b018187da (commit)
       via  f4cd3a9893e2f4a0b6fffcd6824a422e3d603b96 (commit)
       via  eec57e32699568c315ca1134e9186a04c76d2359 (commit)
       via  f2834f4447a9b9b601c0b4f49434a77f9f054e50 (commit)
       via  2d095685cb582285e7ed89c7a984e5277aae0104 (commit)
      from  80b809aa535067a3a87115d19f26feb9b3f9cb60 (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 5d61e1d576fbf98b85d9e9ee8839e3049312a320
Merge: ed6bd17 1fae5d5
Author: Tim Pierce <twp at curoverse.com>
Date:   Thu Jan 22 15:56:28 2015 -0500

    Merge branch 'master' into 4138-node-manager-google-cloud

commit ed6bd1772b009eff0aa3926f45db4a2a447dc40b
Author: Tim Pierce <twp at curoverse.com>
Date:   Wed Jan 21 13:06:35 2015 -0500

    4138: general GCE fixes
    
    * JSON credential file
    ** GCE credentials are delivered as a JSON string (and the key is formatted as a multi-line RSA private key). Let the GCE config file specify a path to the JSON credential file for simplicity.
    * Accept NodeSizes addressed by id or name
    ** In EC2, NodeSizes are identified by the 'id' field.  In GCE they are identified by the 'name' field.  Allow the Node Manager config module to accept either.

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list