From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 27 Aug 2015 21:48:16 +0000 (-0600)
Subject: Merge pull request #114 from ktdreyer/wip-takora
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4835abb2e1fd593c7bc030991d8bb3315b753597;p=ceph-build.git

Merge pull request #114 from ktdreyer/wip-takora

import takora
---

4835abb2e1fd593c7bc030991d8bb3315b753597