From: Tom Clegg <tom@curoverse.com>
Date: Tue, 25 Apr 2017 05:14:23 +0000 (-0400)
Subject: 7709: Merge branch 'master' into 7709-api-rails4
X-Git-Tag: 1.1.0~285^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/3ef580c47029ff0fbf959b044f29c183f41cb609

7709: Merge branch 'master' into 7709-api-rails4

Conflicts:
	services/api/db/structure.sql
---

3ef580c47029ff0fbf959b044f29c183f41cb609
diff --cc services/api/db/structure.sql
index 5c592a264b,d6729428be..3e1fa3fae4
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2757,3 -2778,9 +2778,10 @@@ INSERT INTO schema_migrations (version
  INSERT INTO schema_migrations (version) VALUES ('20170328215436');
  
  INSERT INTO schema_migrations (version) VALUES ('20170330012505');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20170419173031');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20170419173712');
+ 
 -INSERT INTO schema_migrations (version) VALUES ('20170419175801');
++INSERT INTO schema_migrations (version) VALUES ('20170419175801');
++