From 35f52cc31d319f6d90e329a8706a946437ea9cff Mon Sep 17 00:00:00 2001
From: Mike Dirolf <mike@10gen.com>
Date: Wed, 17 Mar 2010 10:48:18 -0400
Subject: [PATCH] BUMP 1.5.1 -- see changelog for details

---
 doc/changelog.rst     | 14 ++++++++++++++
 gridfs/grid_file.py   |  2 +-
 pymongo/__init__.py   |  4 ++--
 pymongo/collection.py |  4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index cd77db9e0..e57c6b0ab 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,6 +1,20 @@
 Changelog
 =========
 
+Changes in Version 1.5.1
+------------------------
+- added :data:`~gridfs.grid_file.GridFile._id` property for
+  :class:`~gridfs.grid_file.GridFile` instances.
+- fix for making a :class:`~pymongo.connection.Connection` (with
+  `slave_okay` set) directly to a slave in a replica pair.
+- accept kwargs for
+  :meth:`~pymongo.collection.Collection.create_index` and
+  :meth:`~pymongo.collection.Collection.ensure_index` to support all
+  indexing options.
+- add :data:`pymongo.GEO2D` and support for geo indexing.
+- improvements to Python code caching in C extension - should improve
+  behavior on mod_wsgi.
+
 Changes in Version 1.5
 ----------------------
 - added subtype constants to :mod:`~pymongo.binary` module.
diff --git a/gridfs/grid_file.py b/gridfs/grid_file.py
index ee0ffe98a..0fa2d5818 100644
--- a/gridfs/grid_file.py
+++ b/gridfs/grid_file.py
@@ -168,7 +168,7 @@ class GridFile(object):
     def _id(self):
         """The ``"_id"`` value for this :class:`GridFile`.
 
-        .. versionadded:: 1.5+
+        .. versionadded:: 1.5.1
         """
         return self.__id
 
diff --git a/pymongo/__init__.py b/pymongo/__init__.py
index 17114ea5c..0255a34da 100644
--- a/pymongo/__init__.py
+++ b/pymongo/__init__.py
@@ -24,7 +24,7 @@ DESCENDING = -1
 GEO2D = "2d"
 """Index specifier for a 2-dimensional `geospatial index`_.
 
-.. versionadded:: 1.5+
+.. versionadded:: 1.5.1
 
 .. note:: Geo-spatial indexing requires server version **>= 1.3.3+**.
 
@@ -38,7 +38,7 @@ SLOW_ONLY = 1
 ALL = 2
 """Profile all operations."""
 
-version = "1.5+"
+version = "1.5.1"
 """Current version of PyMongo."""
 
 Connection = PyMongo_Connection
diff --git a/pymongo/collection.py b/pymongo/collection.py
index d2929cfe4..4798231ce 100644
--- a/pymongo/collection.py
+++ b/pymongo/collection.py
@@ -554,7 +554,7 @@ class Collection(object):
           - `kwargs` (optional): any additional index creation options
             (see the above list) should be passed as keyword arguments
 
-        .. versionchanged:: 1.5+
+        .. versionchanged:: 1.5.1
            Accept kwargs to support all index creation options.
 
         .. versionadded:: 1.5
@@ -642,7 +642,7 @@ class Collection(object):
           - `kwargs` (optional): any additional index creation options
             (see the above list) should be passed as keyword arguments
 
-        .. versionchanged:: 1.5+
+        .. versionchanged:: 1.5.1
            Accept kwargs to support all index creation options.
 
         .. versionadded:: 1.5