]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorDan Mick <dan.mick@inktank.com>
Sat, 22 Jun 2013 01:46:08 +0000 (18:46 -0700)
committerDan Mick <dan.mick@inktank.com>
Sat, 22 Jun 2013 01:46:08 +0000 (18:46 -0700)
Conflicts:
src/ceph.in

1  2 
src/Makefile.am
src/ceph.in

diff --cc src/Makefile.am
Simple merge
diff --cc src/ceph.in
Simple merge