]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorJosh Durgin <jdurgin@redhat.com>
Thu, 22 Jan 2015 00:11:43 +0000 (16:11 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 22 Jan 2015 00:11:43 +0000 (16:11 -0800)
1  2 
src/common/config_opts.h
src/rbd.cc
src/test/Makefile.am

Simple merge
diff --cc src/rbd.cc
Simple merge
Simple merge