]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1661 from ceph/wip-objecter
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 14 Apr 2014 22:36:10 +0000 (15:36 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 14 Apr 2014 22:36:10 +0000 (15:36 -0700)
objecter: make linger watch the correct pool/object

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/osdc/Objecter.cc
src/test/librados/watch_notify.cc

Simple merge
Simple merge