]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorKen Dreyer <ken.dreyer@inktank.com>
Thu, 20 Feb 2014 03:05:51 +0000 (03:05 +0000)
committerKen Dreyer <ken.dreyer@inktank.com>
Thu, 20 Feb 2014 03:06:00 +0000 (03:06 +0000)
Conflicts:
src/test/admin_socket.cc

Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
1  2 
configure.ac
src/common/admin_socket.cc
src/test/admin_socket.cc

diff --cc configure.ac
Simple merge
Simple merge
Simple merge