From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Aug 2014 22:06:11 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-lttng'
X-Git-Tag: v0.86~231
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82ac61fc40d36c479ce0fa82401d356fc7397e52;p=ceph.git

Merge remote-tracking branch 'gh/wip-lttng'
---

82ac61fc40d36c479ce0fa82401d356fc7397e52