summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 0.88v0.88Jenkins2014-11-112-1/+7
* Merge pull request #2878 from ceph/wip-10025Gregory Farnum2014-11-103-24/+71
|\
| * tools: error handling on journal import/exportJohn Spray2014-11-073-21/+59
| * tools: persist trimmed_pos in journal dumpJohn Spray2014-11-071-3/+12
| * tools: fix MDS journal importJohn Spray2014-11-071-1/+1
* | qa/workunits/cephtool/test.sh: ceph, not ./cephSage Weil2014-11-101-1/+1
* | qa/workunits/fs/misc: combine sudo and echo effectivelyGreg Farnum2014-11-101-1/+1
* | Merge pull request #2870 from ceph/wip-blacklist-respawnGregory Farnum2014-11-062-1/+10
|\ \
| * | osdc: fix Journaler write error handlingJohn Spray2014-11-062-1/+10
| |/
* | Merge pull request #2853 from ceph/wip-9977Gregory Farnum2014-11-061-1/+8
|\ \ | |/ |/|
| * tools: skip up to expire_pos in journal-toolJohn Spray2014-11-031-1/+8
|/
* ceph.in: remove '--' from injectargs, if there, as wellDan Mick2014-10-311-0/+2
* msg/Pipe: discard delay queue before incoming queueSage Weil2014-10-291-1/+1
* Merge tag 'v0.87'Sage Weil2014-10-292-1/+7
|\
| * 0.87v0.87Jenkins2014-10-292-1/+7
* | Merge pull request #2829 from ceph/wip-doc-fs-quickstartSage Weil2014-10-291-0/+13
|\ \
| * | doc: include 'fs new' stuff in cephfs quickstartJohn Spray2014-10-291-0/+13
* | | Merge pull request #2828 from Vicente-Cheng/masterJosh Durgin2014-10-291-2/+2
|\ \ \ | |/ / |/| |
| * | rbd: Fix the rbd export when image size more than 2GVicente Cheng2014-10-291-2/+2
|/ /
* | Merge pull request #2823 from dachary/wip-9919-injectargs-side-effectsSage Weil2014-10-281-5/+5
|\ \
| * | qa: avoid qa/workunits/cephtool/test.sh unstabilityLoic Dachary2014-10-281-5/+5
* | | Merge remote-tracking branch 'origin/giant'Josh Durgin2014-10-284-17/+95
|\ \ \ | |/ / |/| / | |/
| * Merge remote-tracking branch 'origin/wip-9806-giant' into giantJosh Durgin2014-10-284-17/+95
| |\
| | * Objecter: resend linger ops on any interval changeJosh Durgin2014-10-234-17/+95
* | | Merge pull request #2809 from ceph/wip-9800John Spray2014-10-281-0/+12
|\ \ \
| * | | client: allow xattr caps in inject_release_failureJohn Spray2014-10-281-0/+12
* | | | Merge pull request #2818 from hjwsm1989/masterLoic Dachary2014-10-281-2/+2
|\ \ \ \
| * | | | Fix the match error when starting OSD daemons.huangjun2014-10-281-2/+2
* | | | | Merge pull request #2815 from wonzhq/evict-atimeSage Weil2014-10-271-2/+1
|\ \ \ \ \
| * | | | | osd: cache tiering: fix the atime logic of the evictionZhiqiang Wang2014-10-281-2/+1
* | | | | | Merge pull request #2786 from ceph/wip-9869Yan, Zheng2014-10-271-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | client: cast m->get_client_tid() to compare to 16-bit Inode::flushing_cap_tidGreg Farnum2014-10-271-1/+2
* | | | | | Merge pull request #2802 from dachary/wip-mailmapDanny Al-Gaaf2014-10-271-0/+1
|\ \ \ \ \ \
| * | | | | | mailmap: Federico Gimenez affiliationLoic Dachary2014-10-251-0/+1
| | |_|/ / / | |/| | | |
* | | | | | unittest_shared_cache: fix build lineSage Weil2014-10-271-1/+1
* | | | | | Merge remote-tracking branch 'gh/giant'Sage Weil2014-10-277-38/+103
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #2630 from ceph/wip-9545Samuel Just2014-10-271-1/+1
| |\ \ \ \ \
| | * | | | | os/FileStore: do not loop in sync_entry on shutdownSage Weil2014-10-031-1/+1
| * | | | | | Merge pull request #2800 from ceph/wip-enoent-raceJoão Eduardo Luís2014-10-262-2/+8
| |\ \ \ \ \ \
| | * | | | | | os/LevelDBStore, RocksDBStore: fix race handling for get store sizeSage Weil2014-10-242-2/+8
| |/ / / / / /
| * | | | | | Merge pull request #2799 from athanatos/wip-9480Sage Weil2014-10-244-21/+117
| |\ \ \ \ \ \
| | * | | | | | FDCache: purge hoid on clearSamuel Just2014-10-221-5/+1
| | * | | | | | shared_cache: add purge and testsSamuel Just2014-10-223-15/+114
| | * | | | | | shared_cache::add: do not delete value if existedSamuel Just2014-10-221-1/+2
| * | | | | | | Merge pull request #2798 from athanatos/wip-9875Sage Weil2014-10-241-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | ReplicatedPG: writeout hit_set object with correct prior_versionSamuel Just2014-10-231-1/+1
| | |/ / / / / /
* | | | | | | | doc/release-notes: giant notesSage Weil2014-10-271-2/+10
* | | | | | | | rgw_rest_client.cc: remove self assignment of new_info.effective_uriDanny Al-Gaaf2014-10-271-2/+0
* | | | | | | | Merge branch 'wip-da-SCA-20141025'Sage Weil2014-10-2739-126/+127
|\ \ \ \ \ \ \ \
| * | | | | | | | test/librbd/fsx.c: fix indentation (NESTING_INDENT_MISMATCH)Danny Al-Gaaf2014-10-271-2/+2