Merge branch 'auth_change_waiters' into unstable

author Sage Weil <sage@newdream.net>

Tue, 24 Aug 2010 03:31:17 +0000 (20:31 -0700)

committer Sage Weil <sage@newdream.net>

Tue, 24 Aug 2010 03:31:17 +0000 (20:31 -0700)
author Sage Weil <sage@newdream.net>
Tue, 24 Aug 2010 03:31:17 +0000 (20:31 -0700)
committer Sage Weil <sage@newdream.net>
Tue, 24 Aug 2010 03:31:17 +0000 (20:31 -0700)
diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/Migrator.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 24 Aug 2010 03:31:17 +0000 (20:31 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 24 Aug 2010 03:31:17 +0000 (20:31 -0700)
		1	2
src/mds/Locker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Migrator.cc	patch \|	diff1 \|	diff2 \|	blob \| history