]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/next'
authorSamuel Just <sam.just@inktank.com>
Fri, 21 Feb 2014 01:04:14 +0000 (17:04 -0800)
committerSamuel Just <sam.just@inktank.com>
Fri, 21 Feb 2014 01:04:14 +0000 (17:04 -0800)

Trivial merge