From: Greg Farnum <greg@inktank.com>
Date: Tue, 30 Apr 2013 22:39:21 +0000 (-0700)
Subject: Merge branch 'wip-4837-election-syncing' into next
X-Git-Tag: v0.61~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cf5824f60b15cdf4db4e895b4da0d6c964b9ed4;p=ceph.git

Merge branch 'wip-4837-election-syncing' into next

Reviewed-by: Sage Weil <sage@inktank.com>
---

3cf5824f60b15cdf4db4e895b4da0d6c964b9ed4