[ARVADOS] updated: a3787ef83a0538097fb6f802f675be740a241ebc

[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 ++
 apps/workbench/test/test_helper.rb                 |  26 +++++
 doc/api/methods/nodes.html.textile.liquid          |   2 +
 doc/api/schema/Job.html.textile.liquid             |   1 +
 doc/api/schema/Node.html.textile.liquid            |   1 +
 docker/api/Dockerfile                              |   3 +-
 docker/api/application.yml.in                      |   2 +
 docker/base/Dockerfile                             |   2 +-
 docker/build_tools/build.rb                        |   1 +
 docker/config.yml.example                          |   5 +
 docker/jobs/Dockerfile                             |   5 +-
 docker/passenger/Dockerfile                        |   6 +-
 sdk/python/arvados/commands/keepdocker.py          |   2 +-
 .../app/controllers/arvados/v1/nodes_controller.rb |  18 ++++
 services/api/app/controllers/static_controller.rb  |  17 +--
 services/api/app/mailers/admin_notifier.rb         |  12 ---
 services/api/app/mailers/user_notifier.rb          |   3 +
 services/api/app/models/arvados_model.rb           |   7 --
 services/api/app/models/job.rb                     |   6 ++
 services/api/app/models/node.rb                    |  11 ++
 .../admin_notifier/new_inactive_user.text.erb      |   4 +-
 .../api/app/views/admin_notifier/new_user.text.erb |   4 +-
 .../views/user_notifier/account_is_setup.text.erb  |   4 +-
 services/api/config/application.default.yml        |  16 ++-
 services/api/config/application.yml.example        |   8 +-
 .../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/test_helper.rb                   |  26 +++++
 services/api/test/unit/permission_test.rb          |  13 +++
 services/keepstore/handler_test.go                 | 120 +++++++++++++++++++--
 services/keepstore/handlers.go                     |  58 +++++++++-
 services/keepstore/keepstore.go                    |  14 ++-
 42 files changed, 513 insertions(+), 234 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  a3787ef83a0538097fb6f802f675be740a241ebc (commit)
       via  c491bfd795b7c7c4f26f18003290bd7ec9e88d60 (commit)
       via  abc1db31bae1b33ed899a1da4b59f2edc0f5f189 (commit)
       via  a805395a2a64aa83a1604ade6932151a0846b577 (commit)
       via  48d04722a5e0478e22be33f58036806a55b3a0eb (commit)
       via  c2e491ff35fe12d895587a6e7cf0cc9f1f7bfcd9 (commit)
       via  94b11dfc98ed84d0f91f2bc2fc81e76b4d3c35d7 (commit)
       via  e9622f371ad4d75f0a0b5ee9480fae779dd63156 (commit)
       via  5253b7d81a54c6087b35148499c360c692fac870 (commit)
       via  a452ab111d29f4f06d31c3fe760bb17b211020a6 (commit)
       via  11b71c18e7506374953119d717f7c4e8c52f8bc4 (commit)
       via  4bb3091019c84f748a60492fb52dcc0bba0bbef0 (commit)
       via  8a833d4bb82249d3f2b9c0473c0af51db92fdc72 (commit)
       via  d962404672ddd32804ddc7b8f502d01843e36404 (commit)
       via  9700a3a646ea5e1d50e5525bd094e8eb90af8ce1 (commit)
       via  8f3b2fc8dbe18a031fb7aa943b626a0f3932c3ec (commit)
       via  6741a2db39cab991efd28d742071170fdbe908f2 (commit)
       via  3154ba6b56adb7a76bd5665c6c4c3326efea8eaa (commit)
       via  409fe707a4d05f1986d7bb0c29ec977d19aa63f5 (commit)
       via  da0d61f9a95848d47d28462d89e0a2070c39d587 (commit)
       via  9340ba16925c4288e6de8a457b74ae9524b04213 (commit)
       via  e350e7a5a074d6666f60b0a1789dce8da3037d8f (commit)
       via  37404e821668b6b9b1952a0a5a3b28901835884b (commit)
       via  0091abfb8041e1f63ba8b7ec9baa7bb57a05bcdb (commit)
       via  301917a75b61cd8a9447b5c525c38dc2e3416c9e (commit)
       via  2b0a7c3f635bc2340956d670c6aeda417dd11cec (commit)
       via  8716b38d3cd20640c28b6fe048927309a0f916cd (commit)
       via  af09cce22f077b5a537e1b7eea8d98981de9f400 (commit)
       via  5fd423a57ab1f34162f4cb2c08bd6b0b2515af40 (commit)
       via  2832018a959557515bfad1f763bf8d4b72182fd6 (commit)
       via  1513d62bc0716698b71789f7affbf78e675cbff8 (commit)
       via  039e808b1be1f2106118dc20174977d8e8766125 (commit)
       via  2b6f61a7d202b771be7e85c14fb4d1cb592142ec (commit)
       via  8934b505b0cdd6af699d910148046ede7c44b7da (commit)
       via  768889aad2bf97586d68b52af4f2b9ccae78251e (commit)
       via  cbd11b4bfd5bcc637abe0e7678239dd1e7a2fbd2 (commit)
      from  ce410ef35e137e040ace097a74a33f04c5975ad9 (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 a3787ef83a0538097fb6f802f675be740a241ebc
Merge: ce410ef c491bfd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 26 09:01:22 2014 -0400

    Merge remote-tracking branch 'origin/master' into 3899-crunch-use-job-state

diff --cc services/api/app/models/job.rb
index 1bf17cc,7da6852..a09ddb2
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@@ -63,8 -65,14 +65,12 @@@ class Job < ArvadosMode
                        running: false)
    end
  
+   def node_uuids
+     nodes.map(&:uuid)
+   end
+ 
    def self.queue
 -    self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ? and success is ?',
 -               nil, nil, nil, nil).
 -      order('priority desc, created_at')
 +    self.where('state = ?', Queued).order('priority desc, created_at')
    end
  
    def queue_position

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


hooks/post-receive
--