Merge pull request #869 from ceph/wip-crush

crush changes for erasure coding

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --cc src/crush/CrushCompiler.cc
Simple merge

diff --cc src/crush/CrushWrapper.cc
Simple merge

diff --cc src/crush/CrushWrapper.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/test/Makefile.am
Simple merge

diff --cc src/tools/crushtool.cc
Simple merge