]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fa8579 23d31d3)
Merge remote-tracking branch 'origin/stable' into next
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 6 Jul 2012 17:12:23 +0000 (10:12 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 6 Jul 2012 17:12:23 +0000 (10:12 -0700)
1  2 
ceph.spec.in patch | diff1 | diff2 | blob | history

diff --cc ceph.spec.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.