]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8733c40 5acb265)
Merge tag 'v10.0.5'
authorSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 17:07:55 +0000 (12:07 -0500)
committerSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 17:07:55 +0000 (12:07 -0500)
v10.0.5

Conflicts:
debian/changelog

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.