[ARVADOS] updated: 274ca7a6c2f1f600de4242eee6cb4e8465d4440c

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/node.rb                          | 16 +++++-----------
 .../db/migrate/20140918153541_add_properties_to_node.rb  |  9 +++++++++
 services/api/db/structure.sql                            |  8 ++++++--
 .../test/functional/arvados/v1/nodes_controller_test.rb  |  7 ++++---
 services/api/test/unit/node_test.rb                      |  8 ++++----
 5 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 services/api/db/migrate/20140918153541_add_properties_to_node.rb

       via  274ca7a6c2f1f600de4242eee6cb4e8465d4440c (commit)
       via  26f139f761174328ea43114a3ef9cb9ad873149a (commit)
       via  4cf16efd4dc5097b59e900d84eef3bf98d80b16f (commit)
      from  4c80f6b8856accfe6017bab4f66d018353986dbc (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 274ca7a6c2f1f600de4242eee6cb4e8465d4440c
Merge: 4c80f6b 26f139f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Sep 18 13:33:03 2014 -0400

    Merge branch '3605-node-info-field' refs #3605
    
    Conflicts:
    	services/api/db/structure.sql

diff --cc services/api/db/structure.sql
index 9ea7844,b19d412..0d8b9dd
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2016,8 -2014,4 +2017,11 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20140828141043');
  
 +INSERT INTO schema_migrations (version) VALUES ('20140909183946');
 +
 +INSERT INTO schema_migrations (version) VALUES ('20140911221252');
 +
- INSERT INTO schema_migrations (version) VALUES ('20140918141529');
++INSERT INTO schema_migrations (version) VALUES ('20140918141529');
++
+ INSERT INTO schema_migrations (version) VALUES ('20140918153541');
++

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


hooks/post-receive
--