summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | ceph.spec.in: add copyright noticeNathan Cutler2016-02-081-0/+13
| |/ / / /
* | | | | Merge pull request #7572 from ceph/wip-cmake-2-8-16Casey Bodley2016-02-081-4/+8
|\ \ \ \ \
| * | | | | cmake: Added new unittests to make checkAli Maredia2016-02-081-4/+8
|/ / / / /
* | | | | Merge pull request #7513 from athanatos/wip-ceph-test-rados-2Sage Weil2016-02-083-140/+256
|\ \ \ \ \
| * | | | | test/osd/: rework ceph_test_rados buffer generation and verificationSamuel Just2016-02-033-127/+254
| * | | | | ceph_test_rados: switch to std::minstd_rand0Samuel Just2016-02-031-13/+2
* | | | | | Merge pull request #5931 from ceph/wip-cxx11concurrencySage Weil2016-02-0826-761/+2174
|\ \ \ \ \ \
| * | | | | | osdc: Update to use C++11 concurrencyAdam C. Emerson2016-02-0516-759/+768
| * | | | | | concurrency: Add shunique_lockAdam C. Emerson2016-02-055-1/+991
| * | | | | | concurrency: make C++11 style debugging muticesAdam C. Emerson2016-02-058-2/+416
* | | | | | | Merge branch 'print-blocked-op' of git://github.com/majianpeng/cephSage Weil2016-02-085-8/+43
|\ \ \ \ \ \ \
| * | | | | | | mds: add dump_blocked_ops asok command.Jianpeng Ma2015-09-022-2/+16
| * | | | | | | osd: add dump_blocked_ops asok command.Jianpeng Ma2015-09-023-6/+27
* | | | | | | | Merge pull request #6608 from esnyder/wip-6634Sage Weil2016-02-082-5/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused SnapContext member snapc from MOSDSubOp message.Emile Snyder2015-12-302-5/+18
* | | | | | | | | Merge branch 'master' of git://github.com/joconcepts/cephSage Weil2016-02-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix rescuing while activatingjoconcepts2016-01-051-1/+1
* | | | | | | | | | Merge pull request #7181 from songbaisen/song5Sage Weil2016-02-081-6/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Crush when get immediate parent quickly reply.songbaisen2016-02-031-6/+5
* | | | | | | | | | | Merge pull request #7437 from Ved-vampir/wip_zlib_pluginSage Weil2016-02-0811-2/+457
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Compressor: add zlib unittestsVed-vampir2016-02-013-0/+160
| * | | | | | | | | | | Compressor: add Zlib compression pluginVed-vampir2016-02-018-2/+297
* | | | | | | | | | | | Merge pull request #7527 from liewegas/wip-no-rgw-prestartSage Weil2016-02-082-102/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | systemd/ceph-radosgw-prestart.sh: removeSage Weil2016-02-042-102/+1
* | | | | | | | | | | | | Merge pull request #7547 from yuyuyu101/wip-14679Haomai Wang2016-02-082-14/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | AsyncConnection: avoid debug log in cleanup_handlerHaomai Wang2016-02-062-14/+9
* | | | | | | | | | | | | | Merge pull request #7554 from tchaikov/wip-ceph-disk-testKefu Chai2016-02-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tests: ceph-disk.sh should compare with the resolved pathKefu Chai2016-02-071-1/+1
* | | | | | | | | | | | | | | Merge pull request #7551 from JevonQ/update-libcephfs-versionSage Weil2016-02-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | libcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changedJevon Qiao2016-02-071-3/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #7549 from tchaikov/wip-fix-ceph-disk-testsKefu Chai2016-02-061-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | ceph-disk/test: fix test_prepare.py::TestPrepare testsKefu Chai2016-02-061-8/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #7540 from dillaman/wip-librados-test-stub-unwatchJosh Durgin2016-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | librados_test_stub: protect against notify/unwatch raceJason Dillaman2016-02-051-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #7529 from dillaman/wip-14412Josh Durgin2016-02-0646-472/+2061
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | librbd: partial implementation of journal client / tag allocationJason Dillaman2016-02-052-3/+32
| * | | | | | | | | | | | | librbd: initial version of journal client and tag metadataJason Dillaman2016-02-0515-59/+326
| * | | | | | | | | | | | | journal: added tag support methodsJason Dillaman2016-02-056-1/+297
| * | | | | | | | | | | | | cls_journal: new get_client / client_update methodsJason Dillaman2016-02-054-5/+185
| * | | | | | | | | | | | | cls_journal: client registration should hold opaque data structureJason Dillaman2016-02-0516-61/+67
| * | | | | | | | | | | | | cls_journal: new tag management methods and handlingJason Dillaman2016-02-056-36/+832
| * | | | | | | | | | | | | journal: switched entry tags to use id instead of stringJason Dillaman2016-02-0528-325/+340
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #7377 from liewegas/wip-datadir-searchSage Weil2016-02-0613-20/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | unittest_config: cope with $data_dir not being expanded on non-daemonsSage Weil2016-02-041-2/+4
| * | | | | | | | | | | | | common: add $data_dir/config to config search pathSage Weil2016-02-041-1/+1
| * | | | | | | | | | | | | common/config: expand $data_dir in config pathSage Weil2016-02-041-0/+17
| * | | | | | | | | | | | | global: add data_dir_option for all daemonsSage Weil2016-02-0412-17/+49
* | | | | | | | | | | | | | Merge pull request #7466 from adamemerson/wip-bsd-time-second-trySage Weil2016-02-062-14/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | time: Remove constexpr from non-literal type in testAdam C. Emerson2016-02-051-2/+1
| * | | | | | | | | | | | | | time: Have skewing-now call non-skewing nowAdam C. Emerson2016-02-051-12/+6