Merge branch 'skip-cephx-if-disabled2' into master

author Guilhem Lettron <guilhem.lettron@optiflows.com>

Wed, 9 Apr 2014 08:34:01 +0000 (10:34 +0200)

committer Guilhem Lettron <guilhem.lettron@optiflows.com>

Wed, 9 Apr 2014 08:34:01 +0000 (10:34 +0200)
author Guilhem Lettron <guilhem.lettron@optiflows.com>
Wed, 9 Apr 2014 08:34:01 +0000 (10:34 +0200)
committer Guilhem Lettron <guilhem.lettron@optiflows.com>
Wed, 9 Apr 2014 08:34:01 +0000 (10:34 +0200)
diff --cc libraries/default.rb
Simple merge
diff --cc recipes/osd.rb
Simple merge
author	Guilhem Lettron <guilhem.lettron@optiflows.com>
	Wed, 9 Apr 2014 08:34:01 +0000 (10:34 +0200)
committer	Guilhem Lettron <guilhem.lettron@optiflows.com>
	Wed, 9 Apr 2014 08:34:01 +0000 (10:34 +0200)
		1	2
libraries/default.rb	patch \|	diff1 \|	diff2 \|	blob \| history
recipes/osd.rb	patch \|	diff1 \|	diff2 \|	blob \| history