*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@809 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/messages/MMonElectionRefresh.h b/ceph/messages/MMonElectionRefresh.h
index cad85f53de0b13595e0ad8f30ff58b7612ead050..0723c9915d49cc2150d5e601570f16dd501b05a7 100644 (file)
--- a/ceph/messages/MMonElectionRefresh.h
+++ b/ceph/messages/MMonElectionRefresh.h
@@ -17,15 +17,16 @@
 
 #include "msg/Message.h"
 
+#include "mon/Elector.h"
 
 class MMonElectionRefresh : public Message {
  public:
   int p;
-  int state;
+  Elector::State state;
   int refresh_num;
 
   MMonElectionRefresh() {}
-  MMonElectionRefresh(int _p, int s, int r) :
+  MMonElectionRefresh(int _p, Elector::State& s, int r) :
        Message(MSG_MON_ELECTION_REFRESH),
        p(_p), state(s), refresh_num(r) {}
  

diff --git a/ceph/messages/MMonElectionStatus.h b/ceph/messages/MMonElectionStatus.h
index 5f8b865e204b75a282decfdd6c6faf19b5bd08b3..d3e861d0ffa765fb4d3bbe85182d58aa7bb63d4d 100644 (file)
--- a/ceph/messages/MMonElectionStatus.h
+++ b/ceph/messages/MMonElectionStatus.h
@@ -17,12 +17,13 @@
 
 #include "msg/Message.h"
 
+#include "mon/Elector.h"
 
 class MMonElectionStatus : public Message {
  public:
   int q;
   int read_num;
-  map<int,int> registry;
+  map<int,Elector::State> registry;
 
   MMonElectionStatus() {}
   MMonElectionStatus(int _q, int r, map<int, int> reg) :