git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f2178d6 d9ff3a6)

author	Sage Weil <sage@redhat.com>
	Thu, 23 Oct 2014 20:45:26 +0000 (13:45 -0700)
committer	Sage Weil <sage@redhat.com>
	Thu, 23 Oct 2014 20:45:26 +0000 (13:45 -0700)
commit	8a9b953b7ca29574f3c6db2dc06732c7d06a9109
tree	42304edd3bc1913e2c6c45fcbdfdb773ec63a269	tree \| snapshot
parent	f2178d6ac4d551bf2487a4fcf2ad0800e379934c	commit \| diff
parent	d9ff3a6b789c5b9c77aefa3751bd808f5d7b8ca7	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.