From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Oct 2014 20:45:26 +0000 (-0700)
Subject: Merge pull request #2785 from athanatos/wip-9821
X-Git-Tag: v0.87~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a9b953b7ca29574f3c6db2dc06732c7d06a9109;p=ceph.git

Merge pull request #2785 from athanatos/wip-9821

PG:: reset_interval_flush and in set_last_peering_reset

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

8a9b953b7ca29574f3c6db2dc06732c7d06a9109