]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 421c0a2 e21071b)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Fri, 12 Dec 2014 14:22:06 +0000 (06:22 -0800)
committerSage Weil <sage@redhat.com>
Fri, 12 Dec 2014 14:22:06 +0000 (06:22 -0800)
1  2 
src/test/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/test/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.