From: John Wilkins <john.wilkins@inktank.com>
Date: Tue, 9 Sep 2014 19:36:55 +0000 (-0700)
Subject: Merge pull request #2256 from ceph/wip-9005
X-Git-Tag: v0.86~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ead619505a1f64a3e5b568b88354783b999d58ea;p=ceph.git

Merge pull request #2256 from ceph/wip-9005

doc: add calamari to the api/index section.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
---

ead619505a1f64a3e5b568b88354783b999d58ea