]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/next'
authorSamuel Just <sam.just@inktank.com>
Wed, 13 Aug 2014 21:11:12 +0000 (14:11 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 13 Aug 2014 21:11:12 +0000 (14:11 -0700)

Trivial merge