]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dd93b9 e868b44)
Merge remote-tracking branch 'gh/stable'
authorSage Weil <sage@newdream.net>
Wed, 30 May 2012 18:02:36 +0000 (11:02 -0700)
committerSage Weil <sage@newdream.net>
Wed, 30 May 2012 18:02:36 +0000 (11:02 -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.