Merge branch 'master' into 1969-persistent-switch

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

diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index 373c279c8952ecaa98c483041e7199b5239baefa..af751fa365f1125cb5404ed01a97c80fa09436ad 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 => 20140421151940) do
+ActiveRecord::Schema.define(:version => 20140422011506) do
 
   create_table "api_client_authorizations", :force => true do |t|
     t.string   "api_token",                                           :null => false
@@ -315,6 +315,8 @@ ActiveRecord::Schema.define(:version => 20140421151940) do
     t.boolean  "active",                  :default => false
     t.datetime "updated_at",                                 :null => false
     t.text     "properties"
+    t.string   "state"
+    t.text     "components_summary"
   end
 
   add_index "pipeline_instances", ["created_at"], :name => "index_pipeline_instances_on_created_at"