[ARVADOS] updated: 2bc8ce335b15136ce39b2652ab41e20b15632d08

[git at public.curoverse.com]

Summary of changes:
 .../api/db/migrate/20140918141529_change_user_owner_uuid_not_null.rb    | 2 ++
 services/api/db/structure.sql                                           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

       via  2bc8ce335b15136ce39b2652ab41e20b15632d08 (commit)
       via  5bb258b6e289b97e4bda28ff1b2d50a255339030 (commit)
      from  f6cd6a5f0ca78c51c30e2689ca3d5a4caeb41073 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2bc8ce335b15136ce39b2652ab41e20b15632d08
Merge: f6cd6a5 5bb258b
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 19 12:27:21 2014 -0400

    Merge branch 'master' into 3898-job-state-attr
    
    Conflicts:
    	services/api/db/structure.sql

diff --cc services/api/db/structure.sql
index 35fc6fa,f991d03..ca87b1b
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2024,6 -2023,4 +2024,6 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20140918141529');
  
 -INSERT INTO schema_migrations (version) VALUES ('20140918153541');
 +INSERT INTO schema_migrations (version) VALUES ('20140918153541');
 +
- INSERT INTO schema_migrations (version) VALUES ('20140918153705');
++INSERT INTO schema_migrations (version) VALUES ('20140918153705');

-----------------------------------------------------------------------


hooks/post-receive
--