Merge branch 'master' into 2882-job-process-stats refs #2882

[arvados.git] / services / api / db / schema.rb

diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index d6be90632a4d2d06dddff2b57a046bf916111543..1ef80ab670389f3a7f87bc9e9581e44cd618a656 100644 (file)
--- a/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@ -11,9 +11,8 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140530200539) do
-
 
+ActiveRecord::Schema.define(:version => 20140602143352) do
 
   create_table "api_client_authorizations", :force => true do |t|
     t.string   "api_token",                                           :null => false
@@ -77,7 +76,6 @@ ActiveRecord::Schema.define(:version => 20140530200539) do
     t.string   "modified_by_user_uuid"
     t.datetime "modified_at"
     t.string   "portable_data_hash"
-    t.string   "name"
     t.integer  "redundancy"
     t.string   "redundancy_confirmed_by_client_uuid"
     t.datetime "redundancy_confirmed_at"
@@ -322,16 +320,14 @@ ActiveRecord::Schema.define(:version => 20140530200539) do
   create_table "pipeline_instances", :force => true do |t|
     t.string   "uuid"
     t.string   "owner_uuid"
-    t.datetime "created_at",                                 :null => false
+    t.datetime "created_at",              :null => false
     t.string   "modified_by_client_uuid"
     t.string   "modified_by_user_uuid"
     t.datetime "modified_at"
     t.string   "pipeline_template_uuid"
     t.string   "name"
     t.text     "components"
-    t.boolean  "success"
-    t.boolean  "active",                  :default => false
-    t.datetime "updated_at",                                 :null => false
+    t.datetime "updated_at",              :null => false
     t.text     "properties"
     t.string   "state"
     t.text     "components_summary"