summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2010-04-07 11:50:21 -0400
committerEliot Horowitz <eliot@10gen.com>2010-04-07 11:50:21 -0400
commit672fda4244c91bf0dc405529767a6939938d3b12 (patch)
tree90277230b7249eef6718f4f4719b2359c0cf202d
parentc0acb04e0f3c837dd8e19d83d14dd0906a19517c (diff)
downloadmongo-672fda4244c91bf0dc405529767a6939938d3b12.tar.gz
BUMP 1.2.5
-rw-r--r--debian/changelog6
-rw-r--r--doxygenConfig2
-rw-r--r--rpm/mongo.spec2
-rw-r--r--stdafx.cpp2
4 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index cb3199ff0a9..dfe06ac4652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mongodb (1.2.5) unsable; urgency=low
+
+ * replication clock skew fix
+
+ -- Richard Kreuter <richard@10gen.com> Fri, 05 Feb 2010 16:56:28 -0500
+
mongodb (1.2.4) unsable; urgency=low
* shell fix
diff --git a/doxygenConfig b/doxygenConfig
index 8f8464b52dc..c5663d453d5 100644
--- a/doxygenConfig
+++ b/doxygenConfig
@@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = MongoDB
-PROJECT_NUMBER = 1.2.4
+PROJECT_NUMBER = 1.2.5
OUTPUT_DIRECTORY = docs
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
diff --git a/rpm/mongo.spec b/rpm/mongo.spec
index eb2c0433163..d25f9663fb3 100644
--- a/rpm/mongo.spec
+++ b/rpm/mongo.spec
@@ -1,5 +1,5 @@
Name: mongo
-Version: 1.3.3
+Version: 1.2.5
Release: mongodb_1%{?dist}
Summary: mongo client shell and tools
License: AGPL 3.0
diff --git a/stdafx.cpp b/stdafx.cpp
index 2791f49d35a..2cf84b75da7 100644
--- a/stdafx.cpp
+++ b/stdafx.cpp
@@ -32,6 +32,6 @@
namespace mongo {
- const char versionString[] = "1.2.5-";
+ const char versionString[] = "1.2.5";
} // namespace mongo