]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Wed, 12 Jun 2013 22:00:05 +0000 (15:00 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Wed, 12 Jun 2013 22:00:05 +0000 (15:00 -0700)
1  2 
src/client/Client.cc
src/common/config_opts.h

Simple merge
Simple merge