]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/next'
authorJosh Durgin <jdurgin@redhat.com>
Tue, 27 Jan 2015 17:37:19 +0000 (09:37 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 27 Jan 2015 17:37:19 +0000 (09:37 -0800)

Trivial merge