]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9231931 9748655)
Merge pull request #3292 from kylinstorage/rbd-merge-diff-v2
authorJosh Durgin <jdurgin@redhat.com>
Fri, 16 Jan 2015 20:08:02 +0000 (12:08 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 16 Jan 2015 20:08:02 +0000 (12:08 -0800)
commita845139d1f274da476e0114daff5aa7585bbabd1
treef2219a46796c79afe787e217607a323f500e7536tree | snapshot
parent9231931607069900ec16fa9f2545ac0c3a121f37commit | diff
parent9748655921a59c440aebfd1bb365f7cffd7e7adccommit | diff
Merge pull request #3292 from kylinstorage/rbd-merge-diff-v2

rbd: merge diff files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
doc/man/8/rbd.rst diff1 | diff2 | blob | history
src/rbd.cc diff1 | diff2 | blob | history
src/test/cli/rbd/help.t diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.