diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2010-12-22 00:22:14 -0500 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2010-12-22 00:22:14 -0500 |
| commit | aa9b13636f892a0f3a1cb8ffc5e5d719af7cc788 (patch) | |
| tree | 18d5da159ab7c676e5e1922abdeb4e8d2831b3ef | |
| parent | 74df9ddc88d47f850d86b496b14ea4d47059fa80 (diff) | |
| parent | 8351914c35437fed4a279a428caaf0133204b7b2 (diff) | |
| download | mongo-aa9b13636f892a0f3a1cb8ffc5e5d719af7cc788.tar.gz | |
Merge branch 'v1.6' of github.com:mongodb/mongo into v1.6
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doxygenConfig | 2 | ||||
| -rw-r--r-- | rpm/mongo.spec | 2 | ||||
| -rw-r--r-- | util/version.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 0ae43df48d5..c3b32b6fd81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -mongodb (1.6.5-rc1) unstable; urgency=low +mongodb (1.6.5) unstable; urgency=low * full change log http://jira.mongodb.org/browse/SERVER/fixforversion/10207 - -- Richard Kreuter <richard@10gen.com> Fri, 19 Nov 2010 16:56:28 -0500 + -- Richard Kreuter <richard@10gen.com> Tue, 7 Dec 2010 16:56:28 -0500 mongodb (1.6.4) unstable; urgency=low diff --git a/doxygenConfig b/doxygenConfig index a5bbee045e9..9d4bbfbe246 100644 --- a/doxygenConfig +++ b/doxygenConfig @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = MongoDB -PROJECT_NUMBER = 1.6.5-rc1 +PROJECT_NUMBER = 1.6.6-pre- OUTPUT_DIRECTORY = docs/doxygen CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/rpm/mongo.spec b/rpm/mongo.spec index 51c285c5c21..98f4d399d67 100644 --- a/rpm/mongo.spec +++ b/rpm/mongo.spec @@ -1,5 +1,5 @@ Name: mongo -Version: 1.6.5-rc1 +Version: 1.6.5 Release: mongodb_1%{?dist} Summary: mongo client shell and tools License: AGPL 3.0 diff --git a/util/version.cpp b/util/version.cpp index 52d99b827dc..c5ca8d40d1b 100644 --- a/util/version.cpp +++ b/util/version.cpp @@ -14,7 +14,7 @@ namespace mongo { // mongo processes version support // - const char versionString[] = "1.6.5-rc2-"; + const char versionString[] = "1.6.6-pre-"; string mongodVersion() { stringstream ss; |