[ARVADOS] updated: b6afb1ac149e6771acd678ac6b4fd2e0afdedb0b

git at public.curoverse.com git at public.curoverse.com
Mon Feb 15 12:47:42 EST 2016


Summary of changes:
 backports/python-gflags/fpm-info.sh                |  1 +
 sdk/cli/bin/crunch-job                             |  6 +-
 sdk/python/setup.py                                |  2 +-
 ...209155729_add_uuid_to_api_token_search_index.rb | 12 ++-
 .../crunchstat_summary/chartjs.py                  | 20 ++++-
 .../crunchstat_summary/reader.py                   | 57 ++++++++------
 .../crunchstat_summary/summarizer.py               | 91 ++++++++++++++++------
 .../tests/logfile_20151204190335.txt.gz.report     | 24 +++---
 .../tests/logfile_20151210063411.txt.gz.report     | 13 +++-
 .../tests/logfile_20151210063439.txt.gz.report     | 13 +++-
 tools/crunchstat-summary/tests/test_examples.py    |  3 +
 11 files changed, 166 insertions(+), 76 deletions(-)
 create mode 100644 backports/python-gflags/fpm-info.sh

       via  b6afb1ac149e6771acd678ac6b4fd2e0afdedb0b (commit)
       via  5581071fcacaf5981f5149a30144d06ddd170a3e (commit)
       via  9c2cc3772d61d0930f28942f778b7ca4b096d717 (commit)
       via  2eb7ed57612ce4d360e02b4c3cd0dc43f6db9511 (commit)
       via  292d026aecbc6b7e1bd12a6c5db8cc905318a992 (commit)
       via  2adcde44af5b170b9c602ffbc3d035bd92b4f05f (commit)
       via  d46ebdc7f1aa7d66d576ec3506edae42181c4e30 (commit)
       via  308fddf4affe8b511c1617230048a554bc19f996 (commit)
       via  0e81ce46c3f8d0b2e404303878c4d203e3523aad (commit)
       via  495a485ff8e7b8c548b943da10c6acfe3eb98165 (commit)
       via  d944cda7fc56ff31bc1bd1200648785e43bf0405 (commit)
       via  7c893926186fec34727f29628dd587ae3cbe86a6 (commit)
       via  6d788bb6ab248cf5aef02a049912fbcd42da514f (commit)
       via  e1385430ac8a650aca04e95abc451d81c2c88cf5 (commit)
       via  aabdbefd374565d5203d414f46eadc8345c022bf (commit)
       via  49dbada3eb269212cdfb38bcae07781e141453fc (commit)
       via  5522d7db6279de7b48fbb734107f7fcd4fed5152 (commit)
       via  93fbce38ba033404b86236101e5491fa89e6abd1 (commit)
       via  3360352ddbcbfa6d89e80f4aae0e20eddd96daf8 (commit)
      from  2d6884f5b20c349e7fd28a51cd876d40524186ad (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 b6afb1ac149e6771acd678ac6b4fd2e0afdedb0b
Author: radhika <radhika at curoverse.com>
Date:   Mon Feb 15 12:47:22 2016 -0500

    8079: add rescue to drop index

diff --git a/services/api/db/migrate/20160209155729_add_uuid_to_api_token_search_index.rb b/services/api/db/migrate/20160209155729_add_uuid_to_api_token_search_index.rb
index 5963788..1bbc16a 100644
--- a/services/api/db/migrate/20160209155729_add_uuid_to_api_token_search_index.rb
+++ b/services/api/db/migrate/20160209155729_add_uuid_to_api_token_search_index.rb
@@ -1,13 +1,19 @@
 class AddUuidToApiTokenSearchIndex < ActiveRecord::Migration
   def up
-    remove_index :api_client_authorizations, :name => 'api_client_authorizations_search_index'
-	  add_index :api_client_authorizations,
+    begin
+      remove_index :api_client_authorizations, :name => 'api_client_authorizations_search_index'
+    rescue
+    end
+    add_index :api_client_authorizations,
               ["api_token", "created_by_ip_address", "last_used_by_ip_address", "default_owner_uuid", "uuid"],
               name: "api_client_authorizations_search_index"
   end
 
   def down
-    remove_index :api_client_authorizations, :name => 'api_client_authorizations_search_index'
+    begin
+      remove_index :api_client_authorizations, :name => 'api_client_authorizations_search_index'
+    rescue
+    end
 	  add_index :api_client_authorizations,
               ["api_token", "created_by_ip_address", "last_used_by_ip_address", "default_owner_uuid"],
               name: "api_client_authorizations_search_index"

commit 5581071fcacaf5981f5149a30144d06ddd170a3e
Merge: 2d6884f 9c2cc37
Author: radhika <radhika at curoverse.com>
Date:   Mon Feb 15 08:40:54 2016 -0500

    Merge branch 'master' into 8079-api-client-auth-uuid


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list