Merge pull request #3361 from wonzhq/watch-notify

author Sage Weil <sage@redhat.com>

Sun, 18 Jan 2015 18:44:35 +0000 (10:44 -0800)

committer Sage Weil <sage@redhat.com>

Sun, 18 Jan 2015 18:44:35 +0000 (10:44 -0800)
author Sage Weil <sage@redhat.com>
Sun, 18 Jan 2015 18:44:35 +0000 (10:44 -0800)
committer Sage Weil <sage@redhat.com>
Sun, 18 Jan 2015 18:44:35 +0000 (10:44 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OpRequest.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sun, 18 Jan 2015 18:44:35 +0000 (10:44 -0800)
committer	Sage Weil <sage@redhat.com>
	Sun, 18 Jan 2015 18:44:35 +0000 (10:44 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OpRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history