From: Samuel Just Date: Fri, 15 Nov 2013 05:40:01 +0000 (-0800) Subject: Merge remote-tracking branch 'upstream/next' X-Git-Tag: v0.74~88^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e53473a7aaa68e03843c521022b9e60b33e4ef3;p=ceph.git Merge remote-tracking branch 'upstream/next' --- 7e53473a7aaa68e03843c521022b9e60b33e4ef3