Merge pull request #12528 from kylinstorage/wip-JournalingObjectStore-cleanup

author Sage Weil <sage@redhat.com>

Thu, 29 Dec 2016 15:27:51 +0000 (09:27 -0600)

committer GitHub <noreply@github.com>

Thu, 29 Dec 2016 15:27:51 +0000 (09:27 -0600)
author Sage Weil <sage@redhat.com>
Thu, 29 Dec 2016 15:27:51 +0000 (09:27 -0600)
committer GitHub <noreply@github.com>
Thu, 29 Dec 2016 15:27:51 +0000 (09:27 -0600)
diff --cc src/os/filestore/JournalingObjectStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 29 Dec 2016 15:27:51 +0000 (09:27 -0600)
committer	GitHub <noreply@github.com>
	Thu, 29 Dec 2016 15:27:51 +0000 (09:27 -0600)