From: Ken Dreyer <ken.dreyer@inktank.com>
Date: Thu, 20 Feb 2014 03:05:51 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: v0.78~149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5c7f6c8e8643c57f92cf7048a9beec080a59fbe;p=ceph.git

Merge branch 'next'

Conflicts:
	src/test/admin_socket.cc

Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
---

c5c7f6c8e8643c57f92cf7048a9beec080a59fbe