---
src/app/models/catalog.rb | 11 +++++++++++
src/app/models/catalog_entry.rb | 4 ++--
src/app/models/deployment.rb | 22 +++++++++++-----------
src/app/models/instance.rb | 2 +-
src/app/models/instance_key.rb | 14 ++++++--------
5 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/app/models/catalog.rb b/src/app/models/catalog.rb
index 6a41c87..58640ec 100644
--- a/src/app/models/catalog.rb
+++ b/src/app/models/catalog.rb
@@ -1,3 +1,14 @@
+# == Schema Information
+#
+# Table name: catalogs
+#
+# id :integer not null, primary key
+# pool_id :integer
+# name :string(255)
+# created_at :datetime
+# updated_at :datetime
+#
+
class Catalog < ActiveRecord::Base
include PermissionedObject
diff --git a/src/app/models/catalog_entry.rb b/src/app/models/catalog_entry.rb
index e529077..fc1cb75 100644
--- a/src/app/models/catalog_entry.rb
+++ b/src/app/models/catalog_entry.rb
@@ -1,13 +1,13 @@
# == Schema Information
-# Schema version: 20110616100915
#
-# Table name: suggested_deployables
+# Table name: catalog_entries
#
# id :integer not null, primary key
# name :string(1024) not null
# description :text not null
# url :string(255)
# owner_id :integer
+# catalog_id :integer not null
#
class CatalogEntry < ActiveRecord::Base
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 04530e9..d0ee262 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -1,18 +1,18 @@
# == Schema Information
-# Schema version: 20110616100915
#
# Table name: deployments
#
-# id :integer not null, primary key
-# name :string(1024) not null
-# realm_id :integer
-# owner_id :integer
-# pool_id :integer not null
-# lock_version :integer default(0)
-# created_at :datetime
-# updated_at :datetime
-# frontend_realm_id :integer
-# deployable_xml :text
+# id :integer not null, primary key
+# name :string(1024) not null
+# realm_id :integer
+# owner_id :integer
+# pool_id :integer not null
+# lock_version :integer default(0)
+# created_at :datetime
+# updated_at :datetime
+# frontend_realm_id :integer
+# deployable_xml :text
+# scheduled_for_deletion :boolean default(FALSE), not null
#
#
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index aee4750..ea7a8f4 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -1,5 +1,4 @@
# == Schema Information
-# Schema version: 20110616100915
#
# Table name: instances
#
@@ -33,6 +32,7 @@
# image_uuid :string(255)
# image_build_uuid :string(255)
# provider_image_uuid :string(255)
+# provider_instance_id :string(255)
#
#
diff --git a/src/app/models/instance_key.rb b/src/app/models/instance_key.rb
index c75f8af..5a4b7de 100644
--- a/src/app/models/instance_key.rb
+++ b/src/app/models/instance_key.rb
@@ -1,15 +1,13 @@
# == Schema Information
-# Schema version: 20110207110131
#
# Table name: instance_keys
#
-# id :integer not null, primary key
-# instance_key_owner_id :integer not null
-# instance_key_owner_type :string(255) not null
-# name :string(255) not null
-# pem :text
-# created_at :datetime
-# updated_at :datetime
+# id :integer not null, primary key
+# instance_id :integer not null
+# name :string(255) not null
+# pem :text
+# created_at :datetime
+# updated_at :datetime
#
#
--
1.7.6