[ARVADOS] updated: 30d63b582ed093d235ae4a9efdeda5de1d4e2f24

git at public.curoverse.com git at public.curoverse.com
Wed Jun 4 15:54:06 EDT 2014


Summary of changes:
 .gitignore                                         |   3 +
 .../app/controllers/application_controller.rb      |  26 +++++
 apps/workbench/app/helpers/application_helper.rb   |  11 ++-
 .../app/models/api_client_authorization.rb         |   2 +-
 apps/workbench/app/models/arvados_base.rb          |   4 +-
 apps/workbench/app/models/authorized_key.rb        |   4 +-
 apps/workbench/app/models/collection.rb            |   2 +-
 apps/workbench/app/models/job.rb                   |   2 +-
 apps/workbench/app/models/pipeline_instance.rb     |   7 +-
 apps/workbench/app/models/user.rb                  |   4 +-
 apps/workbench/app/models/virtual_machine.rb       |   2 +-
 doc/api/methods/users.html.textile.liquid          |   4 -
 ...rial-gatk-variantfiltration.html.textile.liquid |  42 +--------
 doc/user/topics/tutorial-job1.html.textile.liquid  |  12 +--
 docker/api/secret_token.rb.in                      |   5 +
 docker/build_tools/Makefile                        |   3 +-
 docker/config.yml.example                          |   4 +
 docker/jobs/Dockerfile                             |   2 +
 sdk/cli/bin/arv                                    |   2 -
 sdk/cli/bin/crunch-job                             |  31 ++++--
 services/api/Gemfile                               |   1 -
 services/api/Gemfile.lock                          |   2 -
 .../controllers/arvados/v1/groups_controller.rb    |   7 +-
 .../controllers/arvados/v1/job_tasks_controller.rb |   1 +
 .../app/controllers/arvados/v1/jobs_controller.rb  |  45 ---------
 .../app/controllers/arvados/v1/users_controller.rb |  39 +-------
 services/api/app/mailers/admin_notifier.rb         |  52 +++++-----
 services/api/app/models/job.rb                     |  19 ----
 services/api/app/models/link.rb                    |   8 ++
 services/api/app/models/user.rb                    |  10 +-
 .../admin_notifier/after_create_user.text.erb      |   7 --
 .../admin_notifier/new_inactive_user.text.erb      |  13 +++
 .../api/app/views/admin_notifier/new_user.text.erb |  16 ++++
 services/api/config/application.default.yml        |   2 +
 services/api/config/routes.rb                      |   2 -
 .../test/integration/serialized_encoding_test.rb   |  62 ++++++++----
 services/api/test/unit/user_test.rb                | 105 ++++++++++++++++-----
 services/fuse/tests/test_mount.py                  |   7 +-
 services/keep/src/keep/keep.go                     |  53 +++--------
 services/keep/src/keep/volume_unix.go              |  14 +--
 40 files changed, 325 insertions(+), 312 deletions(-)
 delete mode 100644 services/api/app/views/admin_notifier/after_create_user.text.erb
 create mode 100644 services/api/app/views/admin_notifier/new_inactive_user.text.erb
 create mode 100644 services/api/app/views/admin_notifier/new_user.text.erb

       via  30d63b582ed093d235ae4a9efdeda5de1d4e2f24 (commit)
       via  06750c636edc78256a11aec392be21d63a0cceeb (commit)
       via  7ea7c6bc160097c24e2403d6f98f45a4369b4c7d (commit)
       via  e20bd70e4deaf55e7f162307a10118c66e2faac5 (commit)
       via  70dd308c6d20951745d9b8e849131d0b14e7386a (commit)
       via  a4378cd48648a9ca315713535f651d1bbace322f (commit)
       via  b01245c1c7bc78b32dbc124527660b0c36b31a58 (commit)
       via  436d545670d3637dcd96b429e538b995ee98a49b (commit)
       via  ab2550bca241736c162a435d62fc3ccb4ac5dc8e (commit)
       via  debfa4b65640388800daf3ac90263454a6fe2f8d (commit)
       via  96e6e2890330e18af48d460e54077257bd82161e (commit)
       via  656769b7b36b38c564f7da64b275d8831d7a442e (commit)
       via  abc22e2b430a57787adaf9b665cff1214b0d87fc (commit)
       via  0558601e48e0440887ae597a64c314676bb1e138 (commit)
       via  902ff4f1b2c139d7637abeabb610e7e0d0858c0c (commit)
       via  f6235f6bbe13b61b298d07bedb75ba645d69ed15 (commit)
       via  aa58b06d72a858fd63e091622a5bd8b3a9287e72 (commit)
       via  afd7a019bbeed1f194d6f4fbd2e190eae42ddb86 (commit)
       via  65be441066ac47f556b3a19872536b42b09c5e22 (commit)
       via  22e76f53dad163dd1d6703d792d94527d70bb334 (commit)
       via  ae2ecdfac7e8fcab495bfa8f6daa812a70123668 (commit)
       via  b402e6a66e569167c0e990a4fdfc2843df76afd8 (commit)
       via  070e2e8e80cfc88414dd2595cae5bfddce1cd94f (commit)
       via  4609a76d9b84e0f63233cdf6dcbef376b1686b69 (commit)
       via  0c1c7fa2cba96aae542db0e6b6991c71d5ff578a (commit)
       via  ff3686b372cd598ee990acd990af2b04daf91ada (commit)
       via  e9fc734bb270a5648c923ed0419ff745e283419c (commit)
       via  e1868aea69f51b3fb3d281a0dcca66b9de239cfa (commit)
       via  c811cb98bce53f775a865a04ea0f01635dbe75f3 (commit)
       via  ebb166d65eb37f89edeccfc5be97014f3f2a73e2 (commit)
       via  1eee45ce0bbae9e7d04a9382469d2c48fb0cfd3e (commit)
       via  89851a28f3bd8dc05bb8efcab86fa42dda7e7fd2 (commit)
       via  6e0751ce5ea7332fc87e7836c24b6ccb49c399dc (commit)
       via  40cbd508756d5ec3935489fc67f5ada7423dc17f (commit)
       via  83a8512fad199107ff54762658a55176d479a5bb (commit)
      from  37301d86406cc4991c6f149f00a6a0846d1808af (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 30d63b582ed093d235ae4a9efdeda5de1d4e2f24
Merge: 37301d8 06750c6
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 4 15:53:46 2014 -0400

    Merge branch 'master' into 2919-provenance-graph-cutoff


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list