Fix merge conflict. refs #8766
[arvados.git] / sdk / python /
2015-11-13 Brett Smith7696: Refactor locator builder method in PySDK tests.
2015-11-12 radhikaMerge branch 'master' into 7490-datamanager-dont-die...
2015-11-12 Tom CleggMerge branch '5824-keep-web-workbench' closes #5824
2015-11-11 Tom Clegg5824: Fix -attachment-only-host test config. Test more...
2015-11-11 radhikaMerge branch 'master' into 7490-datamanager-dont-die...
2015-11-11 Tom CleggMerge branch '5824-keep-web-workbench' refs #5824
2015-11-11 Tom Clegg5824: Merge branch 'master' into 5824-keep-web-workbench
2015-11-09 radhikaMerge branch 'master' into 7661-fuse-by-pdh
2015-11-08 Tom Clegg5824: Fix server shutdown code.
2015-11-07 Tom Clegg5824: Use fifo2stderr for arv-git-httpd and keep-web...
2015-11-06 Tom Clegg5824: Sync test suite to new keep-web argument names.
2015-11-06 Tom Clegg5824: Merge branch 'master' into 5824-keep-web-workbench
2015-11-06 radhikaMerge branch 'master' into 7490-datamanager-dont-die...
2015-11-06 radhikaMerge branch 'master' into 5538-arvadosclient-retry
2015-11-05 Tom CleggMerge branch '7724-scoped-token' closes #7724
2015-11-05 Tom Clegg7724: Use a scoped token in data manager tests.
2015-11-04 Tom CleggMerge branch '7444-dockercleaner-containers' closes...
2015-11-04 Tom CleggMerge branch '5824-keep-web' into 5824-keep-web-workbench
2015-11-04 Tom Clegg5824: Merge branch 'master' into 5824-keep-web
2015-11-03 radhikaMerge branch 'master' into 7534-superuser-token
2015-11-02 Peter AmstutzMerge branch '7593-cwl-crunchrunner' closes #7593
2015-10-30 Tom Clegg5824: Give an anonymous token to keepproxy, not an...
2015-10-30 Tom Clegg5824: Send keepproxy and keepstore logs to stderr via...
2015-10-30 Tom Clegg5824: Enable anonymous use of keep-web in integration...
2015-10-30 Tom CleggMerge branch '5824-keep-web' into 5824-keep-web-workbench
2015-10-29 Tom Clegg5824: Merge branch 'master' into 5824-keep-web
2015-10-27 radhikaMerge branch 'master' into 7492-keepproxy-upstream...
2015-10-27 Peter AmstutzMerge branch '7582-crunch-runner' refs #7582
2015-10-26 Brett SmithMerge branch 'pr/25'
2015-10-24 Brett SmithMerge branch '7587-pysdk-retry-test-wip'
2015-10-24 Brett Smith7587: Add test for PySDK API client socket.error retries.
2015-10-24 Brett Smith7587: Refactor PySDK API tests to use TestCaseWithServers.
2015-10-23 Peter Amstutz7582: Fixup to work with latest cwltool. Runs jobs...
2015-10-23 Bryan CoscaMerge branch '6600-retry-job-helpers'
2015-10-23 Bryan Cosca6600: Added Retryloop to task_set_output(), current_tas...
2015-10-23 Peter AmstutzMerge branch 'master' into 7582-crunch-runner
2015-10-23 Peter AmstutzMerge branch '7582-run-any-docker-container' refs ...
2015-10-23 radhikaMerge branch 'master' into 7492-keepproxy-upstream...
2015-10-23 Brett SmithMerge branch '7587-httplib2-retries-wip'
2015-10-23 Brett Smith7587: PySDK retries socket.error exceptions from API...
2015-10-22 radhikaMerge branch 'master' into 7546-put-retry
2015-10-22 radhikaMerge branch 'master' into 7167-keep-rsync
2015-10-21 Brett SmithFix multiple exception catching in arv-run.
2015-10-21 Bryan CoscaMerge branch '7015-update-user-guide'
2015-10-21 radhikaMerge branch 'master' into 7492-keepproxy-upstream...
2015-10-20 Tom Clegg6358: Fix probe order test logic.
2015-10-20 Tom Clegg6358: Fix race opportunity in ThreadLimiter.
2015-10-20 radhikaMerge branch 'master' into 7546-put-retry
2015-10-20 radhikaMerge branch 'master' into 7492-keepproxy-upstream...
2015-10-20 Brett SmithMerge branch 'pr/28'
2015-10-20 Brett SmithClean redundant except: blocks in run_test_server.
2015-10-20 Brett Smith7324: Tighten exception ignoring in run_test_server...
2015-10-20 radhikaMerge branch 'master' into 7546-put-retry
2015-10-19 Tom CleggMerge branch '6358-put-rendezvous' closes #6358
2015-10-17 Tom Clegg5824: Refresh keepproxy services list on SIGHUP. Update...
2015-10-17 Tom CleggMerge branch '7173-jessie'
2015-10-17 Tom Clegg5824: Use keep-web in Workbench integration tests
2015-10-16 Tom Clegg6358: Test partial ordering with multiple writer threads.
2015-10-16 Tom Clegg6358: Fix rendezvous probe order on Put.
2015-10-16 Peter AmstutzMerge branch '6321-slurm-oserror' closes #6321
2015-10-16 Colin Nolan7324: Implemented deletion of previous nginx access...
2015-10-15 Tom CleggMerge branch 'wtsi-hgi-feature/arv-view'
2015-10-15 radhikacloses #7167
2015-10-15 radhikaMerge branch 'master' into 7167-keep-rsync
2015-10-15 radhikaMerge branch 'master' into 7167-keep-rsync
2015-10-15 Tom CleggMerge branch 'master' into wtsi-hgi-feature/arv-view
2015-10-15 radhikaMerge branch 'master' into 7167-keep-rsync
2015-10-14 radhikaMerge branch 'master' into 7167-keep-rsync
2015-10-14 radhika7167: loadConfig setupKeepclient do only one set at...
2015-10-14 radhika7167: replace keep_existing with num_keep_servers and...
2015-10-14 radhika7167: replace the keep_existing logic and create all...
2015-10-13 radhika7167: update run_test_servers.py to use action="store_t...
2015-10-13 radhikaMerge branch 'master' into 7167-keep-rsync
2015-10-09 radhikaMerge branch 'master' into 7167-keep-rsync-test-setup
2015-10-08 radhikaMerge branch '7167-keep-rsync-test-setup' into 7167...
2015-10-07 radhika7167: add --keep-enforce-permissions to run_test_servers.py
2015-10-07 radhikaMerge branch 'master' into 7167-keep-rsync-test-setup
2015-10-07 Peter AmstutzMerge branch '6142-cancel-slurm' closes #6142
2015-10-07 radhikaMerge branch 'master' into 7167-keep-rsync
2015-10-07 radhikaMerge branch 'master' into 7167-keep-rsync-test-setup
2015-10-07 Tom CleggMerge branch '7254-dont-lose-replication-arg' closes...
2015-10-07 Brett Smith7254: Test arv-put preserves replication when cache...
2015-10-06 Tom Clegg7254: Test that replication arg is passed through to...
2015-10-06 Tom Clegg7254: Do not forget -replication arg when failing to...
2015-10-06 radhikaMerge branch 'master' into 7167-keep-rsync-test-setup
2015-10-05 radhika7167: Update test to also put a block in dst and attemp...
2015-10-05 radhika7167: args not avaialble in all tests; hence store...
2015-10-05 radhikaMerge branch 'master' into 7167-keep-rsync-test-setup
2015-10-05 radhika7167: keep-rsync parameter loading and intialization...
2015-09-29 Tom CleggMerge branch 'master' into 7241-azure-blob-volume
2015-09-25 radhikacloses #7161
2015-09-25 radhika7161: Use default value of 1 for max_replicas_per_servi...
2015-09-25 radhika7161: white space
2015-09-25 radhika7161: clarify max_replicas_per_service
2015-09-25 radhika7161: Look for all service hints, not just keep proxy...
2015-09-25 radhika7161: working
2015-09-25 radhikaMerge branch 'master' into 7161-support-all-service...
2015-09-24 radhika7161: white space
2015-09-24 radhika7161: clarify max_replicas_per_service
2015-09-24 radhikaMerge branch 'master' into 7162-support-service-types
next