]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0782db3 99a048d)
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Thu, 12 Jul 2012 01:56:00 +0000 (18:56 -0700)
committerSage Weil <sage@inktank.com>
Thu, 12 Jul 2012 01:56:00 +0000 (18:56 -0700)
Conflicts:
src/rados.cc

1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

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