]> 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: 035ea29 102539e)
Merge branch 'wip-13504' of https://github.com/trociny/ceph
authorJosh Durgin <jdurgin@redhat.com>
Thu, 12 Nov 2015 22:08:31 +0000 (14:08 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 12 Nov 2015 22:08:31 +0000 (14:08 -0800)
commit773713b078d5019d20004c6de280f36978754f20
treeaec9f070cbd1d727b3f664a3cea11fdee6b3060btree | snapshot
parent035ea29df24c5c472eb718d82f5558879a9bc028commit | diff
parent102539e176cc92ee2a1344250cf12038e7ea8059commit | diff
Merge branch 'wip-13504' of https://github.com/trociny/ceph

rbd: API: options on image create

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/test/librbd/test_librbd.cc (trivial, two tests added at end of file)
src/test/librbd/test_librbd.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.