[ARVADOS] updated: 1.1.4-390-g99887d1

[Git user]

Summary of changes:
 doc/api/methods/collections.html.textile.liquid        |  1 +
 doc/api/methods/groups.html.textile.liquid             |  1 +
 services/api/app/models/group.rb                       |  3 +++
 .../migrate/20180608123145_add_properties_to_groups.rb | 18 ++++++++++++++++++
 services/api/db/structure.sql                          | 15 ++++++++++++---
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 services/api/db/migrate/20180608123145_add_properties_to_groups.rb

       via  99887d1312315a5efb4d888251f90880846c073c (commit)
       via  4ddcd079b0378d0a8556f528106ac7f60fe5cb1b (commit)
       via  0c458347e92967b5a1e6cce8267939d3ef204663 (commit)
       via  f9347e2f053b645003d102f96a0aee49167baeef (commit)
       via  5f75e2db42cea65e6f4e6b8c2b1b1dfb8e748c05 (commit)
      from  1e03ea4765bee6db9331a1265c8abf2c3e45caff (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 99887d1312315a5efb4d888251f90880846c073c
Merge: 1e03ea4 4ddcd07
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jun 11 15:32:22 2018 -0400

    Merge branch '13562-group-properties' closes #13562
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 4ddcd079b0378d0a8556f528106ac7f60fe5cb1b
Merge: 0c45834 1e03ea4
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jun 11 15:31:56 2018 -0400

    Merge branch 'master' into 13562-group-properties

diff --cc services/api/db/structure.sql
index f5a5f2a,297bf57..a201a05
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -3088,5 -3108,5 +3116,6 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20180514135529');
  
 -INSERT INTO schema_migrations (version) VALUES ('20180607175050');
 +INSERT INTO schema_migrations (version) VALUES ('20180608123145');
  
++INSERT INTO schema_migrations (version) VALUES ('20180607175050');

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


hooks/post-receive
--