From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 2 Apr 2016 19:35:09 +0000 (-0700)
Subject: Merge branch 'wip-cycles'
X-Git-Tag: v10.1.1~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdef226cc9110a9f4e6eea133af2d7e408e25811;p=ceph.git

Merge branch 'wip-cycles'

common/Cycles: Do not initialize Cycles globally

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
---

fdef226cc9110a9f4e6eea133af2d7e408e25811