]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip_watch' into next
authorSage Weil <sage@inktank.com>
Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)
committerSage Weil <sage@inktank.com>
Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)
commit79db5a40c7adb1a09f1ab7831ac242e721a464ff
tree405c6e26051abc06a46a8c0ceb35afe56da8116e
parenta7de975d9344621201a09b03453682cc7c798892
parent97cc55d599ea1588af2e73d6972e1c9dfd9a545b
Merge branch 'wip_watch' into next
src/osd/OSD.cc
src/osd/ReplicatedPG.cc