Merge branch 'master' into 5383-api-db-current-time

[arvados.git] / services / api / db / structure.sql

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 1332995a867bdd146ebf5b7a5c435de360f76752..0711f9025190bbf2a125d52e343f39b07a984d9d 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -168,8 +168,7 @@ CREATE TABLE collections (
     name character varying(255),
     description character varying(524288),
     properties text,
-    expires_at date,
-    redundancy_confirmed_by_client_uuid character varying(255),
+    expires_at timestamp without time zone,
     file_names character varying(8192)
 );
 
@@ -2362,3 +2361,7 @@ INSERT INTO schema_migrations (version) VALUES ('20150206210804');
 INSERT INTO schema_migrations (version) VALUES ('20150206230342');
 
 INSERT INTO schema_migrations (version) VALUES ('20150216193428');
+
+INSERT INTO schema_migrations (version) VALUES ('20150303210106');
+
+INSERT INTO schema_migrations (version) VALUES ('20150312151136');
\ No newline at end of file