Merge branch 'master' into wip-discard

author Sage Weil <sage.weil@dreamhost.com>

Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)

committer Sage Weil <sage.weil@dreamhost.com>

Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)
author Sage Weil <sage.weil@dreamhost.com>
Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)
committer Sage Weil <sage.weil@dreamhost.com>
Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)
diff --cc src/Makefile.am
Simple merge
diff --cc src/librbd.cc
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
author	Sage Weil <sage.weil@dreamhost.com>
	Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)
committer	Sage Weil <sage.weil@dreamhost.com>
	Sun, 22 Apr 2012 04:01:49 +0000 (21:01 -0700)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history