[ARVADOS] updated: 443468308aeb1140a4a898827a0ab55e6b3d056e

git at public.curoverse.com git at public.curoverse.com
Mon Jun 30 14:45:40 EDT 2014


Summary of changes:
 .../app/controllers/actions_controller.rb          | 51 +++++++------
 .../app/controllers/application_controller.rb      |  2 +-
 apps/workbench/app/helpers/application_helper.rb   |  4 +-
 .../app/views/collections/_index_tbody.html.erb    |  2 +-
 .../app/views/collections/_show_recent.html.erb    |  2 +-
 .../app/views/layouts/application.html.erb         | 13 +++-
 .../views/pipeline_instances/_show_recent.html.erb |  4 +-
 .../pipeline_templates/_show_components.html.erb   | 20 +++--
 .../views/pipeline_templates/_show_recent.html.erb | 22 ++++--
 apps/workbench/app/views/users/_tables.html.erb    | 10 +--
 .../test/integration/pipeline_instances_test.rb    | 13 ++--
 crunch_scripts/collection-merge                    | 58 +++++++++++++--
 crunch_scripts/run-command                         | 73 +++++++++++++++++++
 crunch_scripts/subst.py                            | 71 ++++++++++++++++++
 sdk/cli/bin/arv                                    | 85 ++++++++++++++--------
 sdk/cli/bin/arv-run-pipeline-instance              |  3 +-
 sdk/cli/bin/crunch-job                             | 31 ++++++--
 sdk/perl/lib/Arvados.pm                            | 22 ++++--
 sdk/python/arvados/collection.py                   | 27 +++++--
 sdk/python/arvados/stream.py                       | 19 +++--
 sdk/python/arvados/util.py                         |  7 +-
 sdk/python/bin/arv-normalize                       |  5 +-
 sdk/python/tests/test_arv_put.py                   |  8 +-
 sdk/python/tests/test_collections.py               |  2 +-
 services/api/Gemfile                               |  2 +-
 services/api/Gemfile.lock                          |  6 +-
 ..._group.rb => 20140627210837_anonymous_group.rb} |  0
 services/api/db/schema.rb                          |  2 +-
 services/api/lib/current_api_client.rb             | 20 ++---
 services/api/script/cancel_stale_jobs.rb           | 39 ++++++----
 services/api/script/crunch-dispatch.rb             |  4 +
 services/api/script/get_anonymous_user_token.rb    |  6 +-
 .../src/arvados.org/crunchstat/crunchstat.go       |  4 +-
 services/fuse/arvados_fuse/__init__.py             | 47 +++++++-----
 services/fuse/bin/arv-mount                        |  5 +-
 35 files changed, 502 insertions(+), 187 deletions(-)
 mode change 100644 => 100755 crunch_scripts/collection-merge
 create mode 100755 crunch_scripts/run-command
 create mode 100644 crunch_scripts/subst.py
 copy services/api/db/migrate/{20140610210837_anonymous_group.rb => 20140627210837_anonymous_group.rb} (100%)

       via  443468308aeb1140a4a898827a0ab55e6b3d056e (commit)
       via  685f9cb6a771db0d25f000e5bf8616ba1832a218 (commit)
       via  1cfe69550c0cf25bc9dd8d2fc1468906f2b7e0e1 (commit)
       via  f0ab1bd48f45470ffb6fefafa713c51347f5a194 (commit)
       via  5468e482bb0a2a2c18645b15382b69a3d71149fe (commit)
       via  661599a2479c8eb69e644fe3e41d9162b52da316 (commit)
       via  6e86ca6fa82619f721643f2aabc81851cb1e272a (commit)
       via  34389f5d6803e4ae51c09d116baf2d75ef546b10 (commit)
       via  60ea080232db7c31f131f3854dc577bcd89f0e26 (commit)
       via  df91e9651a0075415a257be97f0a92be061141d3 (commit)
       via  f6e2ed9520af6a1184160a2008ed13d3b0f2f76f (commit)
       via  d19180ce1347611daf4e96d3d357fc3d8ea7904f (commit)
       via  9e1d5923421b3439f0cd3297240beebebed38754 (commit)
       via  826a893776dccc6c491037831e91cdd3ecfce37f (commit)
       via  05dccfde466ca973b32e29983628a3d0f4df2607 (commit)
       via  498c9aa9f1f944e885a3a26c83746e2e41326ca8 (commit)
       via  5fd14cac038ae00048eef09c08f4f5d446dffaf4 (commit)
       via  44cc8137d0a0f71ddf0cea123c66ef4c34b50061 (commit)
       via  4d351f0d0c67093440663cee3b52421e3eba7d77 (commit)
       via  6f71acc7f50f6d1b202ac4911a27fe56619615d0 (commit)
       via  6189e6d37b6f05bee599fb54cfb9e29f81665d75 (commit)
       via  377b4f345a5ba45bb96497a6be2b571604a695a1 (commit)
       via  6980251b6acb935d84706133c5837f597c69ead8 (commit)
       via  4a78635a105b43bac10f2f14a4a549f2b05c8a5c (commit)
       via  aeec735ffb81feb118d082856ce4c737ed25e314 (commit)
       via  912e75f5f15f500a0b4ca8860c098400a999b808 (commit)
       via  b5392c5e17a122f04fa3a2289556eda215722b21 (commit)
       via  9f01a7f0a7316be945a009172aa1899d1c1a727b (commit)
       via  b22f6f25891fc9b97d07ef145cfa424f5c532aeb (commit)
       via  874cbef45d163e104908393f0a92b53ecf5b7aff (commit)
       via  169d4321970e87a7000cbd0bb4c763bc57193632 (commit)
       via  f82e5b3b99808ca1b95b9cc55655dd885d5e491f (commit)
       via  947164d3161aafda83522a034a093b193d064c49 (commit)
       via  92aeef019a0c161d5989ffa581f56ba83b887c51 (commit)
       via  e93775274287d344ca325dab430e5d04f283361c (commit)
       via  6449106742aa47e1ec729e28e4b858e25dbeea4f (commit)
       via  f872322df04524d52893f89874f93adec90c2fa7 (commit)
       via  96040562743f6056c2b243db16b5a83244894bd8 (commit)
       via  1a5430a1bfc73674d62cea916b5ea2823959ac13 (commit)
       via  e85c2e7fa4ec91f712caac22350260475bc69945 (commit)
       via  54e2fdfd72beeae2e7a904ca64fa11d02f5f0052 (commit)
       via  d00d9a36af61cf38fa20cc56a9a49401521cb6e1 (commit)
       via  506289bac3ad672715c66b9dc06b770e9be0ef13 (commit)
       via  985d4a785e3df9af520fa171e3483b53eca40088 (commit)
       via  8c5ea8b50cb16a893f19256575ca3bcf4bac5be3 (commit)
       via  632617ca32cb0be73a0a7cfee5a19b2255c7154c (commit)
       via  88bef712f3c9fb6e7b7e5d1eb7b429da598f4eaf (commit)
       via  64437af24f74ec3f48b1a5694a5805d52dfc4967 (commit)
       via  185aee8518374b4a5998b5458248f68d14d5608c (commit)
       via  676dfa352dbf55a23e0123b47d1affe33c028908 (commit)
       via  8817a6f08f4ae90f6696783e56b2e5c5ee6acac8 (commit)
       via  8f2e13c1b0740524415dc7a63159b18ae4a67ca6 (commit)
       via  0eb77fba3f7de714a7edef1c57491f3c285f6d67 (commit)
       via  a9a53c64110796f0ddc97f384b8787f93e8a125b (commit)
       via  70871c7603d5413c800e6bb63b02dfcce34de5e7 (commit)
       via  8298d7a1b1adf8d4c66e60347984762d60e3c665 (commit)
       via  1b08dfa05208e88c86490c8a2ea280c3f65c8d98 (commit)
       via  665812507ba914bd91918fc438faa8036c68181b (commit)
       via  a6611c5dacf93eb127eecb355f6fbdad337e8821 (commit)
       via  be3b0b66d25b94eb450ad1f41d9da0f2bad56fa9 (commit)
       via  904e7f972f9d37031fe6e1c24a2e0233c63d38e2 (commit)
      from  5aeb5892d9784574c3565821a9a42e46673bbbef (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 443468308aeb1140a4a898827a0ab55e6b3d056e
Merge: 5aeb589 685f9cb
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 30 14:20:16 2014 -0400

    Merge branch 'master' into 2659-anonymous-group
    
    Conflicts:
    	apps/workbench/app/views/pipeline_templates/_show_components.html.erb
    	apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
    	services/api/lib/current_api_client.rb
    	services/api/script/get_anonymous_user_token.rb


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list