[ARVADOS] updated: 1.1.1-222-gb112b00

[Git user]

Summary of changes:
 .../arvados/v1/collections_controller.rb           |  2 +-
 .../controllers/arvados/v1/groups_controller.rb    |  7 +---
 services/api/app/models/arvados_model.rb           | 48 +++++++++++++---------
 services/api/app/models/collection.rb              |  3 --
 services/api/app/models/container.rb               |  6 +--
 services/api/app/models/container_request.rb       |  4 +-
 services/api/lib/sweep_trashed_collections.rb      |  4 +-
 .../arvados/v1/collections_controller_test.rb      |  6 +--
 services/api/test/unit/collection_test.rb          | 21 ++++++----
 services/api/test/unit/container_test.rb           |  4 +-
 10 files changed, 52 insertions(+), 53 deletions(-)

       via  b112b002ee3239803d1948e99463144812a2c213 (commit)
       via  363fc6395f866a9631f41630cbff49ac53e9a211 (commit)
      from  dd9651140d782919e475a6252e4c770c46d96252 (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 b112b002ee3239803d1948e99463144812a2c213
Merge: dd96511 363fc63
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Dec 11 16:34:37 2017 -0500

    Merge branch '12511-is-trashed-query' refs #12511
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


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


hooks/post-receive
--