From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Thu, 18 Oct 2018 15:58:57 +0000 (-0400)
Subject: Merge branch 'master' into 14260-runtime-token
X-Git-Tag: 1.3.0~70^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/89be4b30feccc3680ca77339711b29367754dc05

Merge branch 'master' into 14260-runtime-token

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---

89be4b30feccc3680ca77339711b29367754dc05
diff --cc services/api/db/structure.sql
index 636306f976,5b579bd39e..b9db1add05
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -3173,9 -3179,14 +3183,18 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20180904110712');
  
+ INSERT INTO schema_migrations (version) VALUES ('20180913175443');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20180915155335');
+ 
  INSERT INTO schema_migrations (version) VALUES ('20180917205609');
  
 +INSERT INTO schema_migrations (version) VALUES ('20181005192222');
 +
 +INSERT INTO schema_migrations (version) VALUES ('20181011184200');
 +
+ INSERT INTO schema_migrations (version) VALUES ('20180919001158');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20181001175023');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20181004131141');