]> 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: 47f5dc0 b78644e)
Merge tag 'v0.80'
authorSage Weil <sage@inktank.com>
Fri, 9 May 2014 17:58:35 +0000 (10:58 -0700)
committerSage Weil <sage@inktank.com>
Fri, 9 May 2014 17:58:35 +0000 (10:58 -0700)
v0.80

Conflicts:
src/osd/PG.cc
src/osd/ReplicatedPG.cc

1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.