summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve test by getting cloneid from my_snaps vectorwip-snap-test-fixDavid Zafman2013-03-221-4/+4
* Merge remote-tracking branch 'upstream/wip_4435'Samuel Just2013-03-226-39/+108
|\
| * ReplicatedPG: add debug flag to skip full check at reservationSamuel Just2013-03-212-1/+3
| * ReplicatedPG: replica should post BackfillTooFull in do_scan if fullSamuel Just2013-03-211-0/+13
| * PG: halt backfill on RemoteReservationRejected in BackillingSamuel Just2013-03-212-1/+16
| * PG: add helper for adding a timer event to retry backfillSamuel Just2013-03-212-24/+30
| * PG: add BackfillTooFull event for RepRecoveringSamuel Just2013-03-212-1/+12
| * PG: add helper for rejecting backfill reservationSamuel Just2013-03-212-7/+13
| * PG: use OSDService::too_full_for_backfill in RepWaitBackfillReservedSamuel Just2013-03-211-7/+5
| * OSDService: add too_full_for_backfillSamuel Just2013-03-212-0/+18
* | Merge pull request #130 from ceph/wip-fs-renameSage Weil2013-03-221-0/+31
|\ \
| * | test: add ceph_rename testNoah Watkins2013-03-211-0/+31
* | | doc: Added {id} argument to OSD lost.John Wilkins2013-03-221-1/+1
* | | ceph-disk: re-add python 2.7 dependency commentSage Weil2013-03-221-0/+1
* | | Merge pull request #117 from ceph/wip-ceph-diskSage Weil2013-03-226-1764/+1672
|\ \ \
| * \ \ Merge pull request #122 from dalgaaf/wip-da-ceph-disk-1Sage Weil2013-03-201-28/+31
| |\ \ \
| | * | | ceph-disk: cast output of subprocess.Popen() to str()Danny Al-Gaaf2013-03-201-3/+3
| | * | | ceph-disk: fix adjust_symlink() replace 'journal' with 'target'Danny Al-Gaaf2013-03-201-1/+1
| | * | | ceph-disk: fix adjust_symlink() replace 'canonical' with 'path'Danny Al-Gaaf2013-03-201-7/+7
| | * | | ceph-disk: there is no os.path.lstat use os.lstatDanny Al-Gaaf2013-03-201-1/+1
| | * | | ceph-disk: remove unused variable key from prepare_journal_dev()Danny Al-Gaaf2013-03-201-1/+0
| | * | | ceph-disk: fix except to catch OSErrorDanny Al-Gaaf2013-03-201-3/+3
| | * | | ceph-disk: add missing space after >> operatorDanny Al-Gaaf2013-03-201-1/+1
| | * | | fix: Redefining name 'uuid' from outer scope (line 14)Danny Al-Gaaf2013-03-201-10/+10
| | * | | ceph-disk: remove unused variables from list_partitions()Danny Al-Gaaf2013-03-201-1/+1
| | * | | ceph-disk: fix /dev/dm-[0-9] handling list_all_partitions()Danny Al-Gaaf2013-03-201-1/+5
| |/ / /
| * | | Merge pull request #119 from dalgaaf/wip-da-ceph-diskSage Weil2013-03-191-87/+8
| |\ \ \
| | * | | ceph-disk: rename local variable shadowing builtinDanny Al-Gaaf2013-03-191-3/+3
| | * | | ceph-disk: remove twice defined identical function unmountDanny Al-Gaaf2013-03-191-15/+1
| | * | | ceph-disk: remove twice defined function mountDanny Al-Gaaf2013-03-191-34/+0
| | * | | ceph-disk: remove double defined function get_confDanny Al-Gaaf2013-03-191-32/+1
| | * | | ceph-disk: rename local variable shadowing builtinDanny Al-Gaaf2013-03-191-3/+3
| |/ / /
| * | | ceph-disk: install and packageSage Weil2013-03-193-0/+4
| * | | ceph-disk: simplify command dispatchSage Weil2013-03-191-13/+43
| * | | ceph-disk: consolidate exceptionsSage Weil2013-03-191-110/+97
| * | | ceph-disk: consolidate ceph-disk-* into a single binarySage Weil2013-03-193-1764/+1727
* | | | Merge branch 'next'Sage Weil2013-03-223-11/+22
|\ \ \ \
| * | | | osd: reenable 'journal aio = true'Sage Weil2013-03-221-1/+1
| * | | | os/FileJournal: fix aio self-throttling deadlockSage Weil2013-03-221-8/+17
| * | | | Merge pull request #135 from ceph/wip-4519Sage Weil2013-03-211-2/+4
| |\ \ \ \
| | * | | | mon: AuthMonitor: delete auth_handler while increasing max_global_idJoao Eduardo Luis2013-03-221-2/+4
| * | | | | FileJournal: quieter debugging on journal scanningSamuel Just2013-03-211-3/+4
| |/ / / /
* | | | | Merge pull request #137 from dalgaaf/wip-da-cleanup-includesSage Weil2013-03-225-8/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | test/test_snap_mapper.cc: remove twice included <tr1/memory>Danny Al-Gaaf2013-03-221-1/+0
| * | | | mon/MDSMonitor.cc: remove twice included MonitorDBStore.hDanny Al-Gaaf2013-03-221-4/+1
| * | | | mon/LogMonitor.cc: remove twice included <sstream>Danny Al-Gaaf2013-03-221-1/+0
| * | | | mon/AuthMonitor.cc: remove twice included <sstream>Danny Al-Gaaf2013-03-221-1/+0
| * | | | common/Formatter.h: remove twice included <list>Danny Al-Gaaf2013-03-221-1/+0
|/ / / /
* | | | Merge remote-tracking branch 'upstream/wip_osd_shutdown_notification'Samuel Just2013-03-2117-166/+463
|\ \ \ \
| * | | | Makefile: add MOSDMarkMeDownSamuel Just2013-03-211-0/+1