]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/jewel'
authorJosh Durgin <jdurgin@redhat.com>
Tue, 19 Jan 2016 21:41:28 +0000 (13:41 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 19 Jan 2016 21:41:28 +0000 (13:41 -0800)

Trivial merge