From: David Zafman <dzafman@redhat.com>
Date: Fri, 19 Jun 2015 22:57:46 +0000 (-0700)
Subject: Merge pull request #4960 from ceph/wip-10911-firefly
X-Git-Tag: v0.80.11~87
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1623e6c6517ff6958b343493fce6a8e50a52a042;p=ceph.git

Merge pull request #4960 from ceph/wip-10911-firefly

osd,mon: explicitly specify OSD features in MOSDBoot

Reviewed-by: David Zafman <dzafman@redhat.com>
---

1623e6c6517ff6958b343493fce6a8e50a52a042