]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Fri, 20 Jul 2012 03:22:35 +0000 (20:22 -0700)
committerSage Weil <sage@inktank.com>
Fri, 20 Jul 2012 03:22:35 +0000 (20:22 -0700)
commitd76df212c8e1dadb4240fa5c99f108672953a488
treec5dad118df3e05e6051bf93f70136a91494b066a
parentdec936923fa7c9b15caea7ecffcf230d80fc1f85
parent6f381affdcdd5f8a984df9a5b0690b64b84e3900
Merge branch 'next'

Conflicts:
src/include/ceph_features.h
src/include/ceph_features.h