Merge branch 'master' into 9998-no-count-items-available
authorTom Clegg <tom@curoverse.com>
Mon, 16 Jan 2017 16:13:32 +0000 (11:13 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 16 Jan 2017 16:13:32 +0000 (11:13 -0500)
commit609646134bcd8fc3a7fd500848220741ecc4a9d2
tree27b443cc1abe455ea0dcc2d5d146b836dc8b5f1b
parent4032e4dc4284391f21f21630bdb7ca88f8329d8e
parent565e1cc82ed0af5a4d58ea78d6e0294afdd1cba8
Merge branch 'master' into 9998-no-count-items-available

Conflicts:
sdk/go/arvados/resource_list.go
services/keep-balance/collection.go
sdk/go/arvados/resource_list.go
services/api/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/schema_controller.rb
services/keep-balance/collection.go