]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-6685-firefly' into firefly
authorDavid Zafman <david.zafman@inktank.com>
Sat, 22 Feb 2014 03:28:37 +0000 (19:28 -0800)
committerDavid Zafman <david.zafman@inktank.com>
Sat, 22 Feb 2014 03:28:37 +0000 (19:28 -0800)
commita715c7f23fbaa1e9d58a2c109bcea343a61d1044
treeed58a516e756c8d0167a1168c4bcc0e7182da3de
parent72820a84674477464496fc13961316192bc5383b
parenta9677e136ee4753b86ed1151ca6ff08e4b63473d
Merge branch 'wip-6685-firefly' into firefly

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc