]> 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: d159586 725d660)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Wed, 14 Jan 2015 16:57:33 +0000 (08:57 -0800)
committerSage Weil <sage@redhat.com>
Wed, 14 Jan 2015 16:57:33 +0000 (08:57 -0800)
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.