summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Garnaat <mitch@garnaat.com>2012-05-16 07:30:31 -0700
committerMitch Garnaat <mitch@garnaat.com>2012-05-16 07:30:31 -0700
commitfe2064f37ee198a38e90f48b67a0163cfaef86cd (patch)
tree842fe3872b02e045e74fefe9c20d96c7a18718c2
parent1aa1133e8502ea6c95e49ac34681569df5ace46b (diff)
parenta040effbd55a132307b96b7ec480ed4a062f7f1a (diff)
downloadboto-fe2064f37ee198a38e90f48b67a0163cfaef86cd.tar.gz
Merge branch 'hotfix-2.4.1'2.4.1
-rw-r--r--README.rst4
-rw-r--r--boto/__init__.py2
-rw-r--r--docs/source/index.rst1
-rw-r--r--setup.py2
4 files changed, 5 insertions, 4 deletions
diff --git a/README.rst b/README.rst
index 55df13d0..4b520593 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
####
boto
####
-boto 2.4.0
-15-May-2012
+boto 2.4.1
+16-May-2012
************
Introduction
diff --git a/boto/__init__.py b/boto/__init__.py
index d16e024f..9ae6ccaf 100644
--- a/boto/__init__.py
+++ b/boto/__init__.py
@@ -32,7 +32,7 @@ import logging.config
import urlparse
from boto.exception import InvalidUriError
-__version__ = '2.4.0'
+__version__ = '2.4.1'
Version = __version__ # for backware compatibility
UserAgent = 'Boto/%s (%s)' % (__version__, sys.platform)
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 141be760..2c0c78d3 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -42,6 +42,7 @@ Currently Supported Services
* :doc:`Simple Queue Service (SQS) <sqs_tut>` -- (:doc:`API Reference <ref/sqs>`)
* Simple Notification Service (SNS) -- (:doc:`API Reference <ref/sns>`)
* :doc:`Simple Email Service (SES) <ses_tut>` -- (:doc:`API Reference <ref/ses>`)
+ * :doc:`Cloudsearch <cloudsearch_tut>` -- (:doc:`API Reference <ref/cloudsearch>`)
* **Monitoring**
diff --git a/setup.py b/setup.py
index cfa2a953..41dc54f3 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@ setup(name = "boto",
"boto.fps", "boto.emr", "boto.emr", "boto.sns",
"boto.ecs", "boto.iam", "boto.route53", "boto.ses",
"boto.cloudformation", "boto.sts", "boto.dynamodb",
- "boto.swf", "boto.mws"],
+ "boto.swf", "boto.mws", "boto.cloudsearch"],
package_data = {"boto.cacerts": ["cacerts.txt"]},
license = "MIT",
platforms = "Posix; MacOS X; Windows",