]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/next'
authorJosh Durgin <jdurgin@redhat.com>
Wed, 12 Nov 2014 19:18:52 +0000 (11:18 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 12 Nov 2014 19:18:52 +0000 (11:18 -0800)

Trivial merge