]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-rbd-layering'
authorDan Mick <dan.mick@inktank.com>
Sat, 18 Aug 2012 02:29:13 +0000 (19:29 -0700)
committerDan Mick <dan.mick@inktank.com>
Sat, 18 Aug 2012 02:29:13 +0000 (19:29 -0700)
commitecd279f4af879d0729a8e19d2495ee2994e50df3
treed4b16d2f9f7707c454ab7b7f1137b99d4d571066
parentae57db03a9287257f3034fb045c30d5b7edff468
parentf9653589af72b2f5006a66b25412815339dcf6b0
Merge branch 'wip-rbd-layering'

Conflicts:
src/librbd/internal.cc
src/Makefile.am
src/librbd/cls_rbd_client.cc
src/librbd/cls_rbd_client.h
src/librbd/internal.cc
src/rados.cc
src/test/test_librbd.cc