summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rgw: user operation maskwip-4716Yehuda Sadeh2013-05-029-18/+166
* Merge pull request #251 from bkerensa/patch-1Sage Weil2013-05-021-3/+3
|\
| * Update debian.rstBenjamin Kerensa2013-05-021-3/+3
* | doc/install/upgrading...: note about transitioning to ceph-deploySage Weil2013-05-021-0/+13
* | doc/release-notes: note about ceph-deploySage Weil2013-05-021-0/+14
|/
* Merge branch 'next'Sage Weil2013-05-0110-107/+433
|\
| * Merge remote-tracking branch 'gh/wip-doc-cuttlefish' into nextSage Weil2013-05-011-92/+202
| |\
| | * doc: Incorporating Tamil's feedback.John Wilkins2013-04-301-6/+15
| | * doc: Reordered header levels for visual clarity.John Wilkins2013-04-301-15/+11
| | * doc: Fixed a few typos.John Wilkins2013-04-301-2/+2
| | * doc: Updated the upgrade guide for Aronaut and Bobtail to Cuttlefish.John Wilkins2013-04-301-92/+197
| * | Merge remote-tracking branch 'upstream/wip_4884' into nextSamuel Just2013-05-012-5/+32
| |\ \
| | * | OSD: load_pgs() should fill in start_split honestlySamuel Just2013-05-011-5/+25
| | * | OSD: cancel_pending_splits needs to cancel all descendantsSamuel Just2013-05-012-0/+7
| * | | Makefile,gitignore: ceph-monstore-tool, not ceph_monstore_toolSamuel Just2013-05-012-2/+2
| * | | Makefile: put ceph_monstore_tool in bin_DEBUGPROGRAMSSamuel Just2013-05-011-1/+1
| * | | tools: ceph-osdomap-tool.ccSamuel Just2013-05-015-0/+179
| |/ /
| * | dumper: fix Objecter lockingGreg Farnum2013-05-012-8/+18
* | | Merge remote-tracking branch 'gh/next'Sage Weil2013-05-0119-153/+357
|\ \ \ | |/ /
| * | Revert "PaxosService: use get and put for version_t"Sage Weil2013-05-011-2/+8
| * | mon/Paxos: update first_committed when we trimSage Weil2013-05-011-0/+1
| * | mon/Paxos: don't ignore peer first_committedSage Weil2013-05-012-4/+8
| * | OSD: clean up in progress split state on pg removalSamuel Just2013-05-012-21/+95
| * | mon: communicate the quorum_features properly when declaring victory.Greg Farnum2013-04-301-0/+1
| |/
| * Merge branch 'wip-4837-election-syncing' into nextGreg Farnum2013-04-304-58/+43
| |\
| | * mon: Monitor: disregard paxos_max_join_drift when deciding whether to syncJoao Eduardo Luis2013-04-301-4/+3
| | * mon: if we get our own sync_start back, drop it on the floor.Greg Farnum2013-04-301-7/+14
| | * Revert "mon: update assert for looser requirements"Greg Farnum2013-04-301-1/+1
| | * Revert "mon: when electing, be sure acked leaders have new enough stores to l...Greg Farnum2013-04-303-46/+25
| * | ceph-disk: tolerate /sbin/service or /usr/sbin/serviceSage Weil2013-04-301-1/+5
| * | ObjectCacher: wait for all reads when stopping flusherJosh Durgin2013-04-302-2/+23
| * | Merge branch 'wip-mon-compact' into nextSage Weil2013-04-307-3/+76
| |\ \ | | |/ | |/|
| | * mon: enable 'mon compact on trim' by default; trim in larger incrementsSage Weil2013-04-291-3/+3
| | * mon/Paxos: compact on trimSage Weil2013-04-291-0/+4
| | * mon: compact PaxosService prefix on trimSage Weil2013-04-292-0/+5
| | * mon: add compact_prefix transaction operationSage Weil2013-04-291-1/+27
| | * leveldb: add compact_prefix methodSage Weil2013-04-291-0/+11
| | * mon: compact leveldb on bootstrapSage Weil2013-04-291-1/+1
| | * mon: compact leveldb on bootstrapSage Weil2013-04-292-0/+8
| | * mon: --compact argument, config option to compact the store on startSage Weil2013-04-292-0/+10
| | * leveldb: add compact() methodSage Weil2013-04-292-0/+9
| * | elector: trigger a mon reset whenever we bump the epochGreg Farnum2013-04-301-0/+1
| * | Merge branch 'wip-2209' into nextDavid Zafman2013-04-304-61/+95
| |\ \
| | * | Set num_rd, num_wr_kb and num_wr in various places that needed itDavid Zafman2013-04-291-2/+27
| | * | osd: read kb stats not tracked?David Zafman2013-04-293-0/+9
| | * | osd: Rename members and methods related to stat publishDavid Zafman2013-04-294-59/+59
| * | | mon: change leveldb block size to 64KSage Weil2013-04-301-1/+1
* | | | doc/rados/deploy: note that osd delete does not work yetSage Weil2013-05-011-0/+2
* | | | doc/rados/deploy: misc editsSage Weil2013-05-014-18/+18
* | | | Merge pull request #250 from wido/docsSage Weil2013-05-014-68/+66
|\ \ \ \