]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/wip_2476' into next
authorSamuel Just <sam.just@inktank.com>
Wed, 24 Apr 2013 21:03:38 +0000 (14:03 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 24 Apr 2013 21:04:07 +0000 (14:04 -0700)
commit5668e5b5a458fa9404dac85e722bc64ca86bdc46
tree8253b94dd09ca2419176ec3108d1e82c677c1ddc
parent81a6165c13c533e9c1c6684ab7beac09d52ca6b5
parent1f7ff412ab91689fdf6a666c50b52f07199afef5
Merge remote-tracking branch 'upstream/wip_2476' into next

Fixes: #2476
Reviewed-by: Greg Farnum <greg@inktank.com>
src/osd/PG.cc