Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 11 Apr 2014 20:04:28 +0000 (16:04 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 11 Apr 2014 20:04:28 +0000 (16:04 -0400)
commit4c7323ea090e7570f962d821fa24c3ab20308e1e
tree4686459b4108aeafa0a8870fb771acbc4dc326f5
parentcc5023d40182e503e8ba109fc86e09efd6337836
parente3c48fef662408636cb49fe1bb0a3c1040269e7c
Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns

Conflicts:
services/api/app/models/arvados_model.rb
services/api/app/models/arvados_model.rb
services/api/app/models/log.rb
services/api/db/migrate/20140325175653_remove_kind_columns.rb
services/api/db/schema.rb
services/api/test/integration/permissions_test.rb
services/api/test/unit/log_test.rb