summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2015-04-02 11:30:55 -0400
committerEric Milkie <milkie@10gen.com>2015-04-02 11:30:55 -0400
commita0bb65b88e71c4f3cb1e2033b716716bae1a08f9 (patch)
tree817dc18fdd608292f450486c94704aa82c54a54e /src/mongo/db/repl
parentd6d681cf57395943b2f418577634a73296d83c08 (diff)
downloadmongo-a0bb65b88e71c4f3cb1e2033b716716bae1a08f9.tar.gz
SERVER-17795 support commit level on primary, fix compile
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r--src/mongo/db/repl/replica_set_config.cpp2
-rw-r--r--src/mongo/db/repl/replica_set_config.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/repl/replica_set_config.cpp b/src/mongo/db/repl/replica_set_config.cpp
index 236b64b4c47..06c27161bc5 100644
--- a/src/mongo/db/repl/replica_set_config.cpp
+++ b/src/mongo/db/repl/replica_set_config.cpp
@@ -46,6 +46,7 @@ namespace repl {
#endif
const std::string ReplicaSetConfig::kVersionFieldName = "version";
+ const std::string ReplicaSetConfig::kMajorityWriteConcernModeName = "$majority";
const Seconds ReplicaSetConfig::kDefaultHeartbeatTimeoutPeriod(10);
namespace {
@@ -53,7 +54,6 @@ namespace {
const std::string kIdFieldName = "_id";
const std::string kMembersFieldName = "members";
const std::string kSettingsFieldName = "settings";
- const std::string kMajorityWriteConcernModeName = "$majority";
const std::string kStepDownCheckWriteConcernModeName = "$stepDownCheck";
const std::string kProtocolVersionFieldName = "protocolVersion";
diff --git a/src/mongo/db/repl/replica_set_config.h b/src/mongo/db/repl/replica_set_config.h
index 065e90182da..e01c84dfb00 100644
--- a/src/mongo/db/repl/replica_set_config.h
+++ b/src/mongo/db/repl/replica_set_config.h
@@ -53,6 +53,7 @@ namespace repl {
typedef std::vector<MemberConfig>::const_iterator MemberIterator;
static const std::string kVersionFieldName;
+ static const std::string kMajorityWriteConcernModeName;
static const size_t kMaxMembers = 50;
static const size_t kMaxVotingMembers = 7;