Merge pull request #904 from ceph/wip-mds-cluster2

Wip mds cluster2

Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/common/ceph_strings.cc
Simple merge

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

diff --cc src/mds/Capability.h
index 5ba690134f69c149326f7252a64c7e43a6158160,d56e9153865dbee14904569bf7dfe2328ac4785b..e6a6f4721479430906293c2b0fda6987351fc9a0
--- 1/src/mds/Capability.h
--- 2/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@@ -231,11 -247,9 +247,12 @@@ public
      g_num_cap--;
      g_num_caps++;
    }
 +
 +  Capability(const Capability& other);  // no copying
 +  const Capability& operator=(const Capability& other);  // no copying
    
    ceph_seq_t get_mseq() { return mseq; }
+   void inc_mseq() { mseq++; }
  
    ceph_seq_t get_last_sent() { return last_sent; }
    utime_t get_last_issue_stamp() { return last_issue_stamp; }