[ARVADOS] updated: a008743d5471a30c96159b68ea60371a86ef4c0c

git at public.curoverse.com git at public.curoverse.com
Wed Oct 22 22:25:10 EDT 2014


Summary of changes:
 apps/workbench/app/assets/javascripts/dates.js     |   2 +-
 .../views/application/_title_and_buttons.html.erb  |   3 +-
 .../app/views/projects/_show_sharing.html.erb      |  10 +-
 .../test/integration/pipeline_instances_test.rb    |  22 +
 apps/workbench/test/integration/projects_test.rb   |  11 +-
 doc/_config.yml                                    |   3 +
 doc/_includes/_example_docker.liquid               |  28 ++
 .../reference/job-pipeline-ref.html.textile.liquid |   7 +
 doc/user/topics/arv-docker.html.textile.liquid     | 202 +++++++++
 sdk/python/arvados/config.py                       |   5 +-
 services/api/config/application.default.yml        |   3 -
 services/api/script/crunch-dispatch.rb             | 192 ++++----
 services/api/test/fixtures/groups.yml              |   4 +-
 services/api/test/fixtures/jobs.yml                |   2 +-
 services/api/test/fixtures/pipeline_instances.yml  |  26 +-
 services/crunchstat/crunchstat.go                  | 483 +++++++++++++--------
 services/crunchstat/crunchstat_test.go             |  50 +++
 services/nodemanager/arvnodeman/clientactor.py     |  38 +-
 .../nodemanager/arvnodeman/computenode/__init__.py | 130 +++---
 services/nodemanager/arvnodeman/daemon.py          |  23 +-
 services/nodemanager/arvnodeman/jobqueue.py        |  17 +-
 services/nodemanager/arvnodeman/timedcallback.py   |   3 +-
 services/nodemanager/tests/test_clientactor.py     |  25 ++
 services/nodemanager/tests/test_computenode.py     |   8 +
 services/nodemanager/tests/test_daemon.py          |  97 ++++-
 services/nodemanager/tests/test_jobqueue.py        |   4 +-
 26 files changed, 1008 insertions(+), 390 deletions(-)
 create mode 100644 doc/_includes/_example_docker.liquid
 create mode 100644 doc/user/reference/job-pipeline-ref.html.textile.liquid
 create mode 100644 doc/user/topics/arv-docker.html.textile.liquid
 create mode 100644 services/crunchstat/crunchstat_test.go

       via  a008743d5471a30c96159b68ea60371a86ef4c0c (commit)
       via  789e1eb86b5286f3d34b112e0ab802bd3a2793b2 (commit)
       via  a8b3df3d2c5fa8fa66484d6bb0d20a37a0863d90 (commit)
       via  6eaaae29a7af005e417673d79e0951122065e685 (commit)
       via  ff36aa7e753a28cb36bd13e3cd3bbbe4c6617265 (commit)
       via  83fc1e7b7e621be38e43d3d97bd32447ef846eae (commit)
       via  58ead50fe4b7014562c0697290cf933a956ab852 (commit)
       via  5870334b03237f04df6de35193f78b838f7ac7dc (commit)
       via  99ad159b229c312ef6625e6ef042c33d0db524b9 (commit)
       via  e6359fe13c6b3b4558d703fecdd2f5f1713dc0e9 (commit)
       via  89f38df7ce6e3af8e6119a111cdf985de6e0a0e9 (commit)
       via  fe5ee2e37364330b4a58c0c41e8a0b627e8cb1f2 (commit)
       via  1aabac3cbaf0d701696ffabceb992826abeea8c5 (commit)
       via  8d2639525417aaa02240777454405f2249d505b0 (commit)
       via  ca1ddb913b35eaa4aea43a88501c5b7c6ab95e2c (commit)
       via  06686c47a0f99f5b5f292cde2d391024bf107514 (commit)
       via  7d6bf71834622c22fd65faecbff29ba8a333c636 (commit)
       via  6ad9adc1224f1c45a652258d43b7b4b92898e2d1 (commit)
       via  b25d2ec2950f6e2ffa9943a15c87441ebd6672b2 (commit)
       via  0c6f7b227f95394fd4fffadfe7cfa022e32e5fae (commit)
       via  e102efba3f46986b6a2abaee2cc222db8c85198a (commit)
       via  86e8d9a338e3947337898256479fc904b36949c7 (commit)
       via  b5c04e9b23c7292ea8b976d3614a172241eabaad (commit)
       via  9362030c75c09e363f95dcf742f79570107928d1 (commit)
       via  4fb27993c2989648fab6fa29e2073a65b395379d (commit)
       via  15f367505326b375b17f03e4c54a751337155df0 (commit)
       via  183df814d5cb49d11614acb73b07e4e2809524e2 (commit)
       via  de79b73c55c5b1c469766ac8f930f335ac3fc246 (commit)
       via  6d3a88841b58eb02f6f6aedd38a40ed02cc42d1f (commit)
       via  19c0f65c05c4a4d01bc69d98a33cab6ce61b806b (commit)
       via  3254f0a981f72decc49f2fbd43d4cffb47dfb4b4 (commit)
       via  972974d7f305426854ad6c2e271c33730905dee1 (commit)
       via  7d7e23d01f1d00edf49ba50ded5ffe8054691ada (commit)
       via  24ea674969edba33f63921c14dff62192634807c (commit)
       via  e0f182c242423c10783357b5d722511b765033fe (commit)
       via  cef5c3f1b3bf267aedc3ff6ed92778040efb3882 (commit)
       via  1a3d59cd7aa80a4ed6ec72aca1633edcbb788880 (commit)
       via  2e76e6ae877fb528d666071075afe2bf4ab21035 (commit)
       via  a22d6e6bf03c6f274237f775a4c02122c9ce38ef (commit)
       via  ff9423f0859cde002f4d29d735e1310376bb01cc (commit)
       via  cc51562171bfdf2b31d6edab78b1c73b08d02a1e (commit)
       via  ff769230668c11c4f30c0c9b8b7c30908d9ad0f5 (commit)
       via  1bb0592a2fd043b09ab9845cfc25dbdffff1c009 (commit)
       via  41887dd213cfa165925e94d4f3bb120edeb1a30d (commit)
       via  c744c6cecd4f049ce5a2f6e922ca9f74b03fa3a3 (commit)
       via  06d0338d638ce74b51ca3cfe10523e5515269fdf (commit)
       via  ae670519e4075b75346d6152abedf87d41e2cea7 (commit)
       via  85c6c9ee95ce15f6a12b987fe611e917f043e589 (commit)
       via  55cc27092078a78847a2b0230e8782c744e7fff2 (commit)
       via  aa2245a2770dac18a1c26af33cae3e24b3e656ab (commit)
       via  554b4b8821b2eed4c1ce5064e20d043465b571ba (commit)
       via  db0472215ce261406503d7336006bcd64c9feacd (commit)
       via  a5ec4164873e4972aaaf943e48603daa61a044b7 (commit)
       via  75b8b796ee88196ca1b99dcfed0533565c52dce7 (commit)
       via  90057cfa2c19091b0d627a1df978014998e187c6 (commit)
       via  4c0c7699c620226733186c8536b3a8f1d032013f (commit)
       via  1d13d7e2b314a84abe94f00d4c1d787a40f4d7fb (commit)
       via  becd16125599abeefa3d2d1203279bf7eee69669 (commit)
       via  cc09080c6c823a6de8a3eb613ef7d75ec2846857 (commit)
       via  2b08ab24b496f14d2ef97167a2e78e92b179f226 (commit)
       via  5de6c0630a455eb29d83f97e6787a83c8332b1e5 (commit)
       via  b435064a0085044993c5c0f5b8156a61b3e32c54 (commit)
       via  8aeba61dc1cf17b680d6cd3e6bcc4c01f40ff5a3 (commit)
       via  5bce0483011b58a97dded8874491c7b266a850fc (commit)
       via  fd8ed1da05708932eb3e654e333053e1940dc29c (commit)
       via  ee45ddfb506f72a021f772af6477bfeab1204b3a (commit)
       via  c83d732301d7f192895db6c112e0bee29614e314 (commit)
       via  41270a7c0897f2183b6e58674c450a34b65818e9 (commit)
       via  d7e558d103f5620c3c0243c0590dd80b470226ed (commit)
       via  548683db5343421b9abf3ad629054c6da6237928 (commit)
       via  d12f645c2be4e9fd6f89689852efe668bc7d1d83 (commit)
       via  4be40a40a509d1eaad11c442d137f5ecdeb45e25 (commit)
       via  3e4c6eab6c4ed13071fd665aaec8a626a180e6f5 (commit)
       via  7b2a3050d98153329e7a51c3b4fdfdde0859a555 (commit)
       via  1e43af7e01b61945d94ef26c25a1a14b231d605b (commit)
       via  3b0de2173e005deacc22d083a4aea23f9a648865 (commit)
       via  e69a5874b880b9b591e533e2c5f4bc4c3e2ff5d1 (commit)
       via  4f50d3f21494a19eb073a3f8435e872321f35fb6 (commit)
      from  2556bf9a17d39e658f91cd9b180848526415ce92 (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 a008743d5471a30c96159b68ea60371a86ef4c0c
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 22 22:24:37 2014 -0400

    4026: simplify writable check

diff --git a/apps/workbench/app/views/application/_title_and_buttons.html.erb b/apps/workbench/app/views/application/_title_and_buttons.html.erb
index 83d08f5..4a40510 100644
--- a/apps/workbench/app/views/application/_title_and_buttons.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@ -31,8 +31,7 @@
         <i class="fa fa-fw fa-copy"></i> Copy to project...
       <% end %>
     <% end %>
-    <% if @object.owner_uuid == current_user.uuid or current_user.is_admin or
-                                (Group.find(@object.owner_uuid).writable_by.include?(current_user.uuid) rescue nil) %>
+    <% if (ArvadosBase.find(@object.owner_uuid).writable_by.include?(current_user.uuid) rescue nil) %>
       <%= link_to(
           choose_projects_path(
            title: "Move this #{object_class} to:",

commit 789e1eb86b5286f3d34b112e0ab802bd3a2793b2
Merge: 2556bf9 a8b3df3
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 22 20:10:17 2014 -0400

    Merge branch 'master' into 4026-project-move-admin


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list