Merge pull request #2300 from ceph/wip-osdmap

add osdmap checksums

    sage-2014-12-16_06:27:10-rados:singleton-wip-sage-testing2-distro-basic-multi
    sage-2014-12-15_13:18:23-rados:thrash-wip-sage-testing2-distro-basic-multi

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/include/buffer.h
Simple merge

diff --cc src/include/ceph_features.h
index a193d5eb93ca5e5fdcc8f12e5199115ef431221d,e60d72c39bfba874c54807fc358fc093b0b2fcac..d9594a369e3a05b6510de2acf7642d5d7d06194f
--- 1/src/include/ceph_features.h
--- 2/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@@ -54,8 -54,11 +54,12 @@@
  #define CEPH_FEATURE_OSD_POOLRESEND    (1ULL<<43)
  #define CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 (1ULL<<44)
  #define CEPH_FEATURE_OSD_SET_ALLOC_HINT (1ULL<<45)
 +#define CEPH_FEATURE_OSD_FADVISE_FLAGS (1ULL<<46)
  
+ #define CEPH_FEATURE_RESERVED2 (1ULL<<61)  /* slow down, we are almost out... */
+ #define CEPH_FEATURE_RESERVED  (1ULL<<62)  /* DO NOT USE THIS ... last bit! */
+ #define CEPH_FEATURE_RESERVED_BROKEN  (1ULL<<63)  /* DO NOT USE THIS; see below */
+ 
  /*
   * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature
   * vector to evaluate to 64 bit ~0.  To cope, we designate 1ULL << 63

diff --cc src/include/ceph_fs.h
Simple merge

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

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

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSDMap.h
Simple merge

diff --cc src/test/encoding/types.h
Simple merge