Merge pull request #3385 from majianpeng/misc

author Sage Weil <sage@redhat.com>

Sun, 18 Jan 2015 18:41:55 +0000 (10:41 -0800)

committer Sage Weil <sage@redhat.com>

Sun, 18 Jan 2015 18:41:55 +0000 (10:41 -0800)
author Sage Weil <sage@redhat.com>
Sun, 18 Jan 2015 18:41:55 +0000 (10:41 -0800)
committer Sage Weil <sage@redhat.com>
Sun, 18 Jan 2015 18:41:55 +0000 (10:41 -0800)
diff --cc src/librados/librados.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/os/FileJournal.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sun, 18 Jan 2015 18:41:55 +0000 (10:41 -0800)
committer	Sage Weil <sage@redhat.com>
	Sun, 18 Jan 2015 18:41:55 +0000 (10:41 -0800)
		1	2
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history