Makefile: fix mismerge (back to unified httpd conf)

The merge lost changes from 525606fd926e5f564ef0fbd6f14224faed41a0f8

Signed-off-by: Dan Mick <dan.mick@inktank.com>
devmode salt: calamari-ctl can use --devmode here too

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Increased diamond version in requirements.txt

This is to fix the error
"No distributions at all found for python-configobj"
when using lower version of diamond.

Corresponding diamond issue:
https://github.com/BrightcoveOS/Diamond/issues/462

Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
Makefile: update docs target

Signed-off-by: John Spray <john.spray@redhat.com>
Merge pull request #172 from ceph/wip-make-docs

Makefile: update docs target

Reviewed-by: Dan Mick <dan.mick@inktank.com>
minion-sim: add DEFAULT_CRUSH_MAP_TEXT

Needed for doc generation (fills osd_map's crush_map_text)

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Merge pull request #174 from ceph/wip-minion-sim-crush-text

minion-sim: add DEFAULT_CRUSH_MAP_TEXT

Reviewed-by: John Spray <john.spray@inktank.com>
doc/development: fix reference to cthulhu_locking
cthulhu/manager/manager.py: fix comment typo (affects doc)

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Merge pull request #175 from ceph/doc

A few doc fixes

Reviewed-by: John Spray <john.spray@inktank.com>
Merge pull request #168 from kmkanagaraj/fix-requirements

Increased diamond version in requirements.txt

Reviewed-by: John Spray <john.spray@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
doc: add a note on how to update the API docs

Signed-off-by: John Spray <john.spray@redhat.com>
Merge pull request #176 from ceph/wip-doc-howto

doc: add a note on how to update the API docs

Reviewed-by: Dan Mick <dan.mick@inktank.com>
tests: change min_size in to be different than what is in the config

Signed-off-by: Gregory Meno <gregory.meno@inktank.com>