[ARVADOS] updated: d144724e1b48fa10e28f1e0ddddf440c6ac90ee2

git at public.curoverse.com git at public.curoverse.com
Tue May 19 23:00:53 EDT 2015


Summary of changes:
 .../app/assets/javascripts/infinite_scroll.js      |   8 +-
 apps/workbench/app/assets/javascripts/tab_panes.js |  18 +++-
 apps/workbench/app/models/arvados_base.rb          |   2 +-
 .../collections/_show_source_summary.html.erb      |   2 +-
 .../collections_perf_test.rb                       |  97 +++++++++++++++++
 sdk/go/keepclient/keepclient.go                    |  19 +++-
 sdk/go/keepclient/keepclient_test.go               | 115 +++++++++++++++++++--
 sdk/go/keepclient/support.go                       |  11 +-
 sdk/java/pom.xml                                   |  12 +--
 .../java/org/arvados/sdk/{java => }/Arvados.java   |  24 +++--
 .../org/arvados/sdk/{java => }/MethodDetails.java  |   4 +-
 sdk/python/arvados/keep.py                         |  21 ++--
 sdk/python/setup.py                                |   2 +-
 sdk/python/tests/arvados_testutil.py               |   4 +-
 sdk/python/tests/test_keep_client.py               |  10 ++
 services/api/app/models/keep_service.rb            |   1 +
 .../20150512193020_read_only_on_keep_services.rb   |   5 +
 services/api/db/structure.sql                      |   7 +-
 services/keepproxy/keepproxy_test.go               |   8 +-
 services/keepstore/pull_worker.go                  |   2 +-
 20 files changed, 323 insertions(+), 49 deletions(-)
 create mode 100644 apps/workbench/test/integration_performance/collections_perf_test.rb
 rename sdk/java/src/main/java/org/arvados/sdk/{java => }/Arvados.java (96%)
 rename sdk/java/src/main/java/org/arvados/sdk/{java => }/MethodDetails.java (94%)
 create mode 100644 services/api/db/migrate/20150512193020_read_only_on_keep_services.rb

       via  d144724e1b48fa10e28f1e0ddddf440c6ac90ee2 (commit)
       via  a5401e349b25eb0464b06fd291e9c1a18fb494aa (commit)
       via  45d885d56aa967e9699f5245fea30e71f1e2c47e (commit)
       via  6114400831cdcd851be517acc436d46555ced966 (commit)
       via  82f7fcd2f8f57c197dda487285897cbb92a2da21 (commit)
       via  974ab38a740e0dbde9d28ac8848a864981a177e5 (commit)
       via  0f6a00174a83252ff1d72ded61289abf5b34a417 (commit)
       via  f3c4565205413dfeeaa1d2f58634250497d4cf71 (commit)
       via  836999ec3a4d5fc6c9f087a03b131bab06121079 (commit)
       via  3c517a48e838cbd1c8b1fcc27623fb9ddd33c356 (commit)
       via  29009a1c1f8a9653042c5853832881aca4141cf2 (commit)
       via  4110970a34689ed526c3365e9b64a784fba7efda (commit)
       via  d5142a69848df7fa506b8cb16a76cb621598769a (commit)
       via  b085f051e459981a385c95c4ae147546312c08d9 (commit)
       via  f1827e2044aff826e63826880b296a59c4a17e2a (commit)
       via  6702cdabbecef52d342c6f8c67c22cd15377165c (commit)
       via  1f2a1c4d4e12109291578a70e1a1316960343eeb (commit)
       via  8eb65b21a7b7eea1f987d7fec9cb8ac65de2aeb2 (commit)
       via  46b2b9208c6f20c54938ca2312fa56a7f3147472 (commit)
       via  0aaa4681a5ad936aeaa08b9b30b167d9f7cac7cc (commit)
       via  af934d0ffc1d26efc766bb18c226dae70c2179b7 (commit)
       via  a88e87137911142ef7e9237703a1073e4feffdb7 (commit)
       via  731547ae2d548cd2869779c200813262c05581b2 (commit)
       via  d14dd75b263d8f999603b66d23f74667d36a2412 (commit)
       via  17fb6bca5786bad5cff83a187e70adbca9c1d14a (commit)
       via  7e78bad94194f9ce7a39888cbac30eaf4fbf4af7 (commit)
       via  acf8433929b812913208e0868599d3a507c7cf34 (commit)
       via  bfee777f81cbdb447a107f47d6077994e93e4b8c (commit)
       via  7538d084fa8778289053f62a6fb8d3ea04868258 (commit)
       via  e5f039f2e451790ff3838c5810a22a0749d18f6d (commit)
       via  37ab170974e6b15c961605b8ed51678ed58a3a52 (commit)
      from  100a504ea7f42cc29e71800150cf95c90efe6f67 (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 d144724e1b48fa10e28f1e0ddddf440c6ac90ee2
Author: radhika <radhika at curoverse.com>
Date:   Tue May 19 23:00:21 2015 -0400

    6064: rollback cache update so that it can be done in a separate branch.

diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index 4b0a6cf..2fca11e 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -102,7 +102,7 @@ class ArvadosBase < ActiveRecord::Base
     # Only do one lookup on the API side per {class, uuid, workbench
     # request} unless {cache: false} is given via opts.
     cache_key = "request_#{Thread.current.object_id}_#{self.to_s}_#{uuid}"
-    if false != opts[:cache]
+    if opts[:cache] == false
       Rails.cache.write cache_key, arvados_api_client.api(self, '/' + uuid)
     end
     hash = Rails.cache.fetch cache_key do
diff --git a/apps/workbench/app/views/collections/_show_source_summary.html.erb b/apps/workbench/app/views/collections/_show_source_summary.html.erb
index 1d15c96..ddcdc12 100644
--- a/apps/workbench/app/views/collections/_show_source_summary.html.erb
+++ b/apps/workbench/app/views/collections/_show_source_summary.html.erb
@@ -32,7 +32,7 @@
 <% if @log_of.andand.any? %>
   <p><i>This collection contains log messages from:</i><br />
     <%= render_arvados_object_list_start(@log_of, 'Show all jobs',
-                                         jobs_path(filters: [['log', '=', @object.uuid]].to_json)) do |job| %>
+                                         jobs_path(filters: [['log', '=', @object.portable_data_hash]].to_json)) do |job| %>
       <%= link_to_if_arvados_object(job, friendly_name: true) %><br />
     <% end %>
   </p>

commit a5401e349b25eb0464b06fd291e9c1a18fb494aa
Merge: 100a504 45d885d
Author: radhika <radhika at curoverse.com>
Date:   Tue May 19 22:32:25 2015 -0400

    Merge branch 'master' into 6064-collection-output-of-perf-issue


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list