Merge branch 'master' into 4138-node-manager-google-cloud
[arvados.git] / services / api / app / controllers / arvados / v1 / keep_disks_controller.rb
2015-01-22 Tim PierceMerge branch 'master' into 4138-node-manager-google...
2015-01-21 Tom CleggMerge branch '3021-api-performance' refs #3021
2015-01-20 Tom Clegg3021: Merge branch 'master' into 3021-api-performance
2015-01-20 Tom Clegg3021: Replace more "render json:..." with faster Oj.
2015-01-06 Tim PierceMerge branch 'master' into 4138-node-manager-google...
2015-01-06 Peter AmstutzMerge branch 'master' into 4570-multi-auth-method
2014-11-26 Tom Clegg4533: Merge branch 'master' into 4533-remote-reset
2014-11-26 Tom Clegg3781: Merge branch '3781-browser-friendly-servers'...
2014-11-26 Tom Clegg3781: Merge branch 'master' into 3781-browser-friendly...
2014-11-25 Phil HodgsonMerge branch 'master' into 4233-graph-job-stats
2014-11-25 Tom CleggMerge branch '4651-boolean-params' closes #4651
2014-11-24 Tom Clegg4651: Merge branch 'master' into 4651-boolean-params
2014-11-24 Tom Clegg4651: Fix KeepDisksController test failures.
2014-05-14 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
2014-05-07 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-04-30 Tim PierceMerge branch '2620-keep-serialize-io' (closes #2620)
2014-04-30 Tom CleggMerge branch 'master' into 2640-folder-api
2014-04-30 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-29 Tom CleggMerge branch '2640-folder-api' into 1970-folder-view
2014-04-29 Tom CleggMerge branch '0000-ruby-client-config'
2014-04-29 Tom CleggMerge branch 'master' into 1969-persistent-switch
2014-04-29 Tom CleggMerge branch '2640-folder-api' into 1970-folder-view
2014-04-29 Brett Smithapi: Introduce path-based API token scopes.
2014-04-28 Brett SmithMerge branch '1904-object-scopes'
2014-04-28 Brett Smithapi: Introduce path-based API token scopes.
2014-04-16 Peter AmstutzMerge branch '2376-show-collection-tags-everywhere'
2014-04-16 Peter AmstutzMerge branch '2488-jobs-pipeline-doc'
2014-04-15 Tom CleggMerge branch 'master' into 2596-refactor-pipeline-create
2014-04-15 Peter AmstutzMerge branch '2376-show-collection-tags-everywhere...
2014-04-15 Peter AmstutzMerge branch 'master' into 1971-show-image-thumbnails
2014-04-15 Tom CleggMerge branch '2388-bogus-token-error-page'
2014-04-14 radhika chippadaMerge branch 'master' into 1776-setup-user-email
2014-04-14 Tim PierceMerge branch '2449-keep-write-blocks' into 2449-keep...
2014-04-14 Tim PierceMerge branch 'master' into 2449-keep-write-blocks
2014-04-14 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-11 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-11 Peter AmstutzMerged master
2014-03-25 Peter AmstutzAll tests pass!
2014-02-07 Peter AmstutzMerge branch 'master' into 1786-replace-jekyll-with...
2014-01-28 Peter AmstutzMerge branch 'master' into 1977-provenance-report
2014-01-25 Tom CleggUpdate tests to match recent permission changes; dry...
2014-01-24 Tom CleggFix keep_disks.ping to accept a correct ping_secret...
2014-01-22 Peter AmstutzMerge remote-tracking branch 'origin' into 1786-replace...
2014-01-17 Tim PierceMerge branch 'master' of git.clinicalfuture.com:arvados
2014-01-16 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-01-15 Tom CleggInactive users can get a list of Keep disks.
2013-11-25 Tom CleggDo not require filesystem_uuid in first keep_disks...
2013-11-22 Tom CleggFix up keep_disks/ping and add tests. refs #1581
2013-11-18 Tim PierceMerge branch '1579-keep-server-in-docker' of git.clinic...
2013-11-18 Tom CleggAllow all active users to retrieve list of keep nodes.
2013-11-15 Tom CleggAllow all active users to retrieve list of keep nodes.
2013-07-30 Tom Cleggadd auth scopes
2013-04-25 Tom Cleggkeep_disks#ping
2013-04-25 Tom Cleggfix keep_disks/ping routing & discovery
2013-04-25 Tom Cleggadd KeepDisk resource