projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
de083a9
bf5d77b
)
7709: Merge branch 'master' into 7709-api-rails4
author
Tom Clegg <tom@curoverse.com>
Tue, 25 Apr 2017 05:14:23 +0000
(
01:14
-0400)
committer
Tom Clegg <tom@curoverse.com>
Tue, 25 Apr 2017 05:14:23 +0000
(
01:14
-0400)
Conflicts:
services/api/db/structure.sql
1
2
services/api/db/structure.sql
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/db/structure.sql
index 5c592a264b21a4dd136f9d78ba53fa24878c052b,d6729428beaf00e48e7bceefea2bc1df1fb843b0..3e1fa3fae4be514e5d47761ca616ef072142fae3
---
1
/
services/api/db/structure.sql
---
2
/
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 ('20170419175801');
+
+ INSERT INTO schema_migrations (version) VALUES ('20170419173031');
+
+ INSERT INTO schema_migrations (version) VALUES ('20170419173712');
+
++INSERT INTO schema_migrations (version) VALUES ('20170419175801');
++