]> 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: cae663a c165483)
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Wed, 1 Jan 2014 07:53:37 +0000 (07:53 +0000)
committerGary Lowell <gary.lowell@inktank.com>
Wed, 1 Jan 2014 07:53:37 +0000 (07:53 +0000)
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.