]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 884aa8a 1103079)
Merge branch 'stable'
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 22 May 2012 19:54:09 +0000 (12:54 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Tue, 22 May 2012 19:54:09 +0000 (12:54 -0700)
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.