Merge branch 'master' into 3605-improved-dashboard
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 18 Sep 2014 17:51:13 +0000 (13:51 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 18 Sep 2014 17:51:13 +0000 (13:51 -0400)
commitb522f728ae1674c9b9bcee189885d919e91acccf
treedddb2e878e377fca5df24feb26e58b29df8a8db8
parent5a3b04f7177afe202ab4f8776b5ca2567b4fdabe
parent403d9f6b700f38cd3caf067445233b5ead99466c
Merge branch 'master' into 3605-improved-dashboard

Conflicts:
services/api/app/controllers/arvados/v1/jobs_controller.rb
services/api/app/controllers/arvados/v1/jobs_controller.rb