[ARVADOS] updated: 2d6884f5b20c349e7fd28a51cd876d40524186ad

git at public.curoverse.com git at public.curoverse.com
Wed Feb 10 13:57:38 EST 2016


Summary of changes:
 apps/workbench/Gemfile.lock                        |  3 --
 crunch_scripts/crunchutil/subst.py                 |  2 +-
 crunch_scripts/run-command                         | 17 ++++++---
 sdk/cli/bin/crunch-job                             | 44 ++++++++++++++--------
 ...8210629_add_uuid_to_api_client_authorization.rb |  4 +-
 ...209155729_add_uuid_to_api_token_search_index.rb |  9 ++++-
 services/api/lib/crunch_dispatch.rb                |  5 +--
 7 files changed, 53 insertions(+), 31 deletions(-)

       via  2d6884f5b20c349e7fd28a51cd876d40524186ad (commit)
       via  d7e559136a7ed5ee3f178b26aa2b5924cea1bca7 (commit)
       via  fdc9a9308c646d23ec50073833f141ceebf78613 (commit)
       via  2b324ca45515fbf079afb15db821f437ee6b64a5 (commit)
       via  74bfe6e5794b42d3158d9358245802e73942b909 (commit)
       via  d1c72b300d50f071106a320a807f465c251a812e (commit)
       via  baeb7dbe5929012dea22985b11ae4c5584f76891 (commit)
       via  19199a75e41004ea776622c305c3ca43e5367bf2 (commit)
       via  ddd02b0a536cbc0e80b77df43939e30f294126b5 (commit)
       via  090b515aa10dba597b20a96797f17688f582a529 (commit)
       via  fcbb743e3de63e93280f2fbeedea49f98430d26f (commit)
       via  e8b7fbbd711836c59824327364e15ef2253a5848 (commit)
       via  1fc6d7713baabfe85b49191e156b6c093d22b69f (commit)
       via  d4807ea755bcd122388189815b0b6d5aaa295509 (commit)
       via  3f5b70e78c4008e0de876e53fc7fbbc0671a6937 (commit)
       via  3a8714e6fcf41c46d1fde0a6a3e4beb1367d181d (commit)
      from  13163d646a6da8d53984dfb54d365cdfb90afde3 (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 2d6884f5b20c349e7fd28a51cd876d40524186ad
Author: radhika <radhika at curoverse.com>
Date:   Wed Feb 10 13:51:20 2016 -0500

    8079: add down migration to api_client_authorizations_search_index

diff --git a/services/api/db/migrate/20160208210629_add_uuid_to_api_client_authorization.rb b/services/api/db/migrate/20160208210629_add_uuid_to_api_client_authorization.rb
index cc86001..69da34c 100644
--- a/services/api/db/migrate/20160208210629_add_uuid_to_api_client_authorization.rb
+++ b/services/api/db/migrate/20160208210629_add_uuid_to_api_client_authorization.rb
@@ -6,8 +6,8 @@ class AddUuidToApiClientAuthorization < ActiveRecord::Migration
   def up
     add_column :api_client_authorizations, :uuid, :string
     add_index :api_client_authorizations, :uuid, :unique => true
-    
-    prefix = Server::Application.config.uuid_prefix + '-' + 
+
+    prefix = Server::Application.config.uuid_prefix + '-' +
              Digest::MD5.hexdigest('ApiClientAuthorization'.to_s).to_i(16).to_s(36)[-5..-1] + '-'
 
     update_sql <<-EOS
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 c246591..5963788 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,8 +1,15 @@
 class AddUuidToApiTokenSearchIndex < ActiveRecord::Migration
-  def change
+  def up
     remove_index :api_client_authorizations, :name => 'api_client_authorizations_search_index'
 	  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'
+	  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"
+  end
 end

commit d7e559136a7ed5ee3f178b26aa2b5924cea1bca7
Merge: 13163d6 fdc9a93
Author: radhika <radhika at curoverse.com>
Date:   Wed Feb 10 12:23:50 2016 -0500

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


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list