Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Tue, 4 Jun 2013 20:08:07 +0000 (13:08 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 4 Jun 2013 20:08:07 +0000 (13:08 -0700)
author Sage Weil <sage@inktank.com>
Tue, 4 Jun 2013 20:08:07 +0000 (13:08 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 4 Jun 2013 20:08:07 +0000 (13:08 -0700)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 4 Jun 2013 20:08:07 +0000 (13:08 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 4 Jun 2013 20:08:07 +0000 (13:08 -0700)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history