]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/next'
authorJosh Durgin <jdurgin@redhat.com>
Thu, 22 Jan 2015 21:05:12 +0000 (13:05 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 22 Jan 2015 21:05:12 +0000 (13:05 -0800)

Trivial merge