Merge branch '7711-record-node-price' closes #7711
[arvados.git] / services / api / config / application.yml.example
2014-05-22 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2044...
2014-05-22 radhikaMerge branch 'master' into 2767-doc-updates
2014-05-21 radhikaMerge branch 'master' into 2756-eventbus-in-workbench
2014-05-21 Peter AmstutzMerge branch '2798-go-keep-client' into 1885-keep-proxy
2014-05-21 Peter AmstutzMerge branch 'master' into 2798-go-keep-client
2014-05-21 Tim PierceMerge branch 'master' of git.curoverse.com:arvados
2014-05-21 Tim PierceMerge branch '2755-api-collection-permissions'
2014-05-21 Tim Pierce2755: incorporate code review
2014-05-21 Tim Pierce2755: fix merge conflicts (refs #2755)
2014-05-21 Tim PierceMerge branch '2755-api-collection-permissions' of git...
2014-05-19 Tim Pierce2755: Verify permission signatures on create.
2014-05-15 Tom Clegg2809: Merge branch 'master' refs #2809
2014-05-14 Tim Pierce2755: Verify permission signatures on create.
2014-05-14 Tim PierceMerge branch '2328-keep-permission-flags' (closes ...
2014-05-13 Peter Amstutz2798: Merged branch with code to read environment varia...
2014-05-09 radhikaMerge branch 'master' into 2767-doc-updates
2014-05-09 Tom CleggFix python SDK test suite issues.
2014-05-07 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-05-01 Tom CleggMerge branch '2640-folder-api' into 1970-folder-view
2014-05-01 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2035...
2014-05-01 Tom CleggMerge branch 'master' into 2640-folder-api
2014-05-01 radhikaMerge branch 'master' into 2525-java-sdk
2014-04-30 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-04-30 Peter AmstutzMerge branch 'origin-2608-websocket-event-bus-alt2'
2014-04-30 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-30 Peter AmstutzMoved message handling out to a separate method for...
2014-04-30 Peter AmstutzNow supports both websocket integrated (ARVADOS_WEBSOCK...
2014-04-15 Peter AmstutzMerge branch 'master' into 1971-show-image-thumbnails
2014-04-11 Peter AmstutzMerged master
2014-04-01 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-03-28 Tim PierceMerge branch '2291-new-keepd-read-blocks'
2014-03-28 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-28 Tom CleggMerge branch 'master' into 1932-job-output-persistent
2014-03-27 radhika chippadaMerge branch 'master' into 2068-reset-user
2014-03-27 Peter AmstutzMerged branch 1741-internal-git-repo into 2333-crunch...
2014-03-16 Tom CleggMerge branch 'master' into 2290-user-activity
2014-03-16 radhika chippadaMerge branch 'master' into 2187-enhance-user-setup
2014-03-14 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2075...
2014-03-14 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-14 Tom CleggMerge branch '2257-inequality-conditions'
2014-03-14 Brett Smithapi: Improve compute_node_domain handling.
2014-03-14 Tom CleggMerge branch '2257-inequality-conditions' into 2290...
2014-03-14 Tom CleggMerge branch 'master' into 2257-inequality-conditions
2014-03-14 radhika chippadaMerge branch 'master' into 2187-enhance-user-setup
2014-03-13 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-13 Tom CleggFix order of steps in install doc, add git_repositories_dir
2014-03-13 Tom CleggRemove some stumbling blocks in default/example configs
2014-03-11 Peter AmstutzMerge branch '2107-update-documentation'
2014-03-11 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-11 Tim PierceMerge branch 'master' of git.clinicalfuture.com:arvados
2014-03-11 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-03-11 Tom CleggUpdate comment to refer to correct default-config file.
2014-03-11 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-10 Peter AmstutzMerge branch '2042-new-collection-from-selected-files'
2014-03-10 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-03-10 Tom CleggRename load_config to zz_load_config so initializers...
2014-03-10 Tom CleggMerge branch '2076-check-config-at-boot'
2014-03-10 Tom CleggMerge branch 'master' into 2189-log-in-as-user
2014-03-10 Tom CleggRename config[.defaults].yml to application[.default...