From: Greg Farnum <greg@inktank.com>
Date: Thu, 6 Sep 2012 20:25:49 +0000 (-0700)
Subject: Merge branch 'master' into ceph-client-no-library
X-Git-Tag: rebased
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20e6c9ab4f549da6aed1ef466058d19580095935;p=ceph-cookbooks.git

Merge branch 'master' into ceph-client-no-library

Conflicts:
	recipes/osd.rb
---

20e6c9ab4f549da6aed1ef466058d19580095935