summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnie Hershey <ernie.hershey@10gen.com>2014-04-06 20:36:57 -0400
committerErnie Hershey <ernie.hershey@10gen.com>2014-04-06 20:36:57 -0400
commit1c1c76aeca21c5983dc178920f5052c298db616c (patch)
treeefb1900d69d5c37fd15bde685d3cc5e6d50432e7
parent8a71a071e54d96361fcabb992cd82f60ce413eb8 (diff)
downloadmongo-r2.6.0.tar.gz
BUMP 2.6.0r2.6.0
-rw-r--r--doxygenConfig2
-rw-r--r--src/mongo/util/version.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/doxygenConfig b/doxygenConfig
index d28bb9898c6..33522c72988 100644
--- a/doxygenConfig
+++ b/doxygenConfig
@@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = MongoDB
-PROJECT_NUMBER = 2.6.0-rc4-pre-
+PROJECT_NUMBER = 2.6.0
OUTPUT_DIRECTORY = docs/doxygen
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
diff --git a/src/mongo/util/version.cpp b/src/mongo/util/version.cpp
index 7d92b44fbc6..5f7e53c2611 100644
--- a/src/mongo/util/version.cpp
+++ b/src/mongo/util/version.cpp
@@ -31,7 +31,7 @@ namespace mongo {
* 1.2.3-rc4-pre-
* If you really need to do something else you'll need to fix _versionArray()
*/
- const char versionString[] = "2.6.0-rc4-pre-";
+ const char versionString[] = "2.6.0";
// See unit test for example outputs
BSONArray toVersionArray(const char* version){