]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit07038a79f37cb12d4f00683d012402b34f8633ce
treeb5817a59750f9f7754c7d56e8c3386de6523ffc6
parent4d7a6a755e108187de5757f9f8f31acefe388b8f
parent4d3b49e9d62bc1040356ca3ebe7f90c181734eb6
Merge branch 'next'
src/common/config_opts.h
src/rbd.cc
src/test/Makefile.am