Merge branch '2986-arv-edit' closes #2986

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

diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index 22a019424f5b0485001af932b7e25920c7cca85c..1f9b5019ab60a528ba72434d4d91190783195bef 100644 (file)
--- a/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140519205916) do
+ActiveRecord::Schema.define(:version => 20140611173003) do
 
 
 
@@ -77,7 +77,6 @@ ActiveRecord::Schema.define(:version => 20140519205916) 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"
@@ -196,6 +195,8 @@ ActiveRecord::Schema.define(:version => 20140519205916) do
     t.boolean  "nondeterministic"
     t.string   "repository"
     t.boolean  "output_is_persistent",     :default => false, :null => false
+    t.string   "supplied_script_version"
+    t.string   "docker_image_locator"
   end
 
   add_index "jobs", ["created_at"], :name => "index_jobs_on_created_at"
@@ -321,16 +322,14 @@ ActiveRecord::Schema.define(:version => 20140519205916) 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"
@@ -350,6 +349,7 @@ ActiveRecord::Schema.define(:version => 20140519205916) do
     t.string   "name"
     t.text     "components"
     t.datetime "updated_at",              :null => false
+    t.text     "description"
   end
 
   add_index "pipeline_templates", ["created_at"], :name => "index_pipeline_templates_on_created_at"