]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitc5c7f6c8e8643c57f92cf7048a9beec080a59fbe
tree8537fb67571421d5a1d38030cf93bf8d7a010c9d
parentaa110af991e6d637b30d740af46f3dc2168cde01
parent1bca9c5c412b3af722d5250f07fd562a23cf35ff
Merge branch 'next'

Conflicts:
src/test/admin_socket.cc

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