Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@redhat.com>

Tue, 19 Aug 2014 04:10:32 +0000 (21:10 -0700)

committer Sage Weil <sage@redhat.com>

Tue, 19 Aug 2014 04:10:32 +0000 (21:10 -0700)
author Sage Weil <sage@redhat.com>
Tue, 19 Aug 2014 04:10:32 +0000 (21:10 -0700)
committer Sage Weil <sage@redhat.com>
Tue, 19 Aug 2014 04:10:32 +0000 (21:10 -0700)
diff --cc configure.ac
Simple merge
diff --cc src/os/FileJournal.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 19 Aug 2014 04:10:32 +0000 (21:10 -0700)
committer	Sage Weil <sage@redhat.com>
	Tue, 19 Aug 2014 04:10:32 +0000 (21:10 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history