4823: Files now fall under collection's lock. Add tests for merge conflicts.
[arvados.git] / sdk / python / arvados / collection.py
2014-09-18 Peter AmstutzMerge branch '3605-node-info-field' refs #3605
2014-09-17 Tom Clegg3550: Merge branch 'master' into 3550-local-pipeline
2014-09-17 mishazMerge branch 'update-go-sdk-documentation'
2014-09-17 Tim PierceMerge branch '3411-expire-collections'
2014-09-17 Peter AmstutzMerge branch '3187-pipeline-instance-page' into 3605...
2014-09-17 Tim PierceMerge branch '3411-expire-collections'
2014-09-17 Peter AmstutzMerge branch 'master' into 3605-improved-dashboard
2014-09-17 Peter AmstutzMerge branch '3605-node-info-field' refs #3605
2014-09-17 Tim PierceMerge branch '3705-keep-blockworklist'
2014-09-16 radhikaMerge branch 'master' into 2761-diagnostic-suite
2014-09-16 Tom CleggMerge branch '3877-log-memory-leak' closes #3877
2014-09-16 Peter AmstutzMerge branch '3878-arv-mount-block-cache' closes #3878
2014-09-16 Peter Amstutz3878: Fix block cache sharing across threads so arv...
2014-09-15 Tim PierceMerge branch 'master' into 3699-arv-copy
2014-09-15 radhikaMerge branch 'master' into 2761-diagnostic-suite
2014-09-15 Tom Clegg3550: Merge branch 'master' into 3550-local-pipeline
2014-09-15 Peter AmstutzMerge branch '3187-pipeline-instance-page' into 3605...
2014-09-12 radhikaMerge branch 'master' into 3654-combine-selections
2014-09-12 Peter AmstutzMerge branch 'master' into 3605-improved-dashboard
2014-09-12 radhikaMerge branch 'master' into 2875-pipeline-description
2014-09-12 Tim PierceBug fix: manifests with extra spaces
2014-09-11 Peter AmstutzMerge branch '3187-start-finish-timestamps-tasks-pipeli...
2014-09-11 radhikaMerge branch 'master' into 3654-combine-selections
2014-09-11 Peter AmstutzMerge branch 'master' into 3187-start-finish-timestamps...
2014-09-11 radhikaMerge branch 'master' into 2761-diagnostic-suite
2014-09-10 Brett SmithPrevent PySDK CollectionReader from sending UUIDs to...
2014-09-09 radhikaMerge branch 'master' into 3654-combine-selections
2014-09-09 Peter AmstutzMerge branch '3453-arv-list-docker-images' closes ...
2014-09-09 Peter AmstutzMerge branch 'master' into 3586-job-priority closes...
2014-09-08 Peter AmstutzMerge branch '3644-arv-mount-projects' closes #3644
2014-09-08 Peter AmstutzMerge branch 'master' into 3644-arv-mount-projects
2014-09-04 Peter Amstutz3644: Tweak CollectionReader manifest text regular...
2014-08-27 Tom Clegg3354: Merge branch 'master' into 3354-render-textile
2014-08-26 Tom CleggMerge branch '3171-admin-groups' closes #3171
2014-08-25 Tom Clegg3171: Merge branch 'master' into 3171-group-membership
2014-08-25 Tim PierceMerge branch '3448-keep-put-timestamps'
2014-08-22 radhikaMerge branch 'master' into 3188-remove-selected-button
2014-08-22 radhikaMerge branch 'master' into 3153-auto-setup-user
2014-08-22 radhikaMerge branch 'master' into 3112-report-bug
2014-08-22 Peter AmstutzMerge branch '3504-clients-compatible-with-3036' refs...
2014-08-21 Peter AmstutzMerge remote-tracking branch 'refs/remotes/origin/3504...
2014-08-21 Peter AmstutzMerge remote-tracking branch 'origin/master' into 3504...
2014-08-20 Peter Amstutz3504: CollectionReader accepts arvados object collectio...
2014-08-20 radhikaMerge branch 'master' into 3112-report-bug
2014-08-20 radhikaMerge branch 'master' into 3153-auto-setup-user
2014-08-20 Brett Smith2800: Delay API client creation in Python CollectionReader.
2014-08-20 Brett SmithMerge branch '2800-pysdk-no-global-keep-client-wip'
2014-08-20 Brett Smith2800: Migrate from Keep to KeepClient in the Python...
2014-08-20 radhikaMerge branch 'master' into 3112-report-bug. Also, break...
2014-08-20 Phil HodgsonMerge branch 'master' into 3354-render-textile
2014-08-19 Peter AmstutzMerge branch 'master' into 3036-collection-uuids
2014-08-19 Peter AmstutzMerge branch 'master' into 3504-clients-compatible...
2014-08-18 Tom Clegg3114: Merge branch 'master' into 3114-copy-to-project
2014-08-18 Tom CleggMerge branch '2800-pgs' refs #2800
2014-08-18 Tom CleggMerge branch '3604-theme-and-new-user-process' closes...
2014-08-18 Tom CleggDo not throw away permission hints when writing data...
2014-08-16 Tom CleggMerge branch '2800-python-global-state' into 2800-pgs
2014-08-15 radhikaMerge branch 'master' into 3112-report-bug
2014-08-15 Tom CleggRestore trailing newline in manifest format sanity...
2014-08-14 Peter AmstutzMerge branch 'master' into 3505-virtual-work-dir
2014-08-14 radhikaMerge branch 'master' into 3112-report-bug
2014-08-13 Tom Clegg3551: Merge branch 'master' into 3551-go-layout
2014-08-13 Peter AmstutzFix degenerate case exponential runtime in regular...
2014-08-13 Brett SmithMerge branch '3457-pysdk-logging-wip'
2014-08-13 Brett Smith3457: Revamp Python SDK and tool logging.
2014-07-03 Tim PierceMerge branch '2873-permission-links-ownership'
2014-07-01 Tom CleggMerge branch '3099-spinner-assets' closes #3099
2014-06-30 radhikaMerge branch 'master' into 3076-topnav-help
2014-06-30 radhikaMerge branch 'master' into 3088-project-chooser-on...
2014-06-30 radhikaMerge branch 'master' into 2659-anonymous-server-side
2014-06-27 Peter AmstutzHandle empty directories in arv-put. refs #3087
2014-06-27 Peter AmstutzHandle zero-length streams that contain zero-length...
2014-06-27 radhikaMerge branch 'master' into 3076-topnav-help
2014-06-27 radhikaMerge branch 'master' into 3088-project-chooser-on...
2014-06-27 radhikaMerge branch 'master' into 2659-anonymous-server-side
2014-06-27 Peter AmstutzMerge branch 'pete-fixes' closes #3096
2014-06-26 Peter AmstutzMerge remote-tracking branch 'origin/master' into pete...
2014-06-24 Peter AmstutzMerge remote-tracking branch 'origin/master' into pete...
2014-06-24 Peter AmstutzAdds "--strip" option to arv-normalize to strip off...
2014-06-02 radhikaMerge branch 'master' into 2919-provenance-graph-cutoff
2014-05-31 Peter AmstutzMerge remote-tracking branch 'refs/remotes/origin/2939...
2014-05-30 radhikaMerge branch 'master' into 2903-remove-pi-active-and...
2014-05-30 radhikaMerge branch 'master' into 2895-no-more-redis
2014-05-30 Ward VandewegeMerge branch 'master' into 2681-new-inactive-user-notif...
2014-05-30 Tim PierceMerge branch '2755-python-sdk-permissions'
2014-05-30 Tim PierceMerge branch 'master' into 2755-python-sdk-permissions
2014-05-30 Tom Clegg2893: Merge branch 'master' into 2893-no-symbols-in-db
2014-05-30 radhikaMerge branch 'master' into 2919-provenance-graph-cutoff
2014-05-30 Brett SmithMerge branch '2752-arv-put-resume'
2014-05-30 Brett Smith2752: Resumed collection writer doesn't do_queued_work...
2014-05-30 Brett Smith2752: Remove unused CollectionWriter checkpoint hook.
2014-05-30 Brett Smith2752: arv-put displays a notice when it resumes.
2014-05-30 Brett Smith2752: Avoid hiccup on arv-put with short stdin.
2014-05-30 Brett Smith2752: Improve arv-put initialization from cache.
2014-05-30 Brett Smith2752: arv-put shouldn't resume from expired Keep locators.
2014-05-30 Brett Smith2752: Add arvados.collections.ResumableCollectionWriter.
2014-05-30 Brett Smith2752: Implement CollectionWriter with a work queue.
2014-05-30 Brett Smith2752: Reuse CollectionWriter.write_file() where possible.
2014-05-30 Brett Smith2752: Add method CollectionWriter.write_file().
2014-05-30 Brett Smith2752: Remove trailing whitespace in arv-put.
next