]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72820a8 a9677e1)
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)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.