diff options
author | Mitch Garnaat <mitch@garnaat.com> | 2012-03-20 05:05:53 -0700 |
---|---|---|
committer | Mitch Garnaat <mitch@garnaat.com> | 2012-03-20 05:05:53 -0700 |
commit | 2d882029846a00b5216876e1c1e07ad1ccc4c60a (patch) | |
tree | 171fe5c51643e614bf10f8e1b3d6111a55bdfeb0 | |
parent | 94c739193a12fb2fca1062af3b2031fd6a3c3344 (diff) | |
parent | c4f3744d7ccb7e593f45346e11031e0651a536b6 (diff) | |
download | boto-2d882029846a00b5216876e1c1e07ad1ccc4c60a.tar.gz |
Merging from release-2.3.0 branch to master.2.3.0
-rw-r--r-- | README.markdown | 14 | ||||
-rw-r--r-- | boto/__init__.py | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/README.markdown b/README.markdown index c636ad01..e2a53f4c 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,6 @@ # boto -boto 2.2.2 -14-Feb-2012 +boto 2.3.0 +18-Mar-2012 ## Introduction @@ -27,6 +27,7 @@ At the moment, boto supports: * Flexible Payment Service (FPS) * CloudFormation * Amazon DynamoDB + * Amazon SimpleWorkflow The goal of boto is to support the full breadth and depth of Amazon Web Services. In addition, boto provides support for other public @@ -44,13 +45,11 @@ to keep boto compatible with Python 2.5.x but no guarantees are made. The main source code repository for boto can be found on [github.com](http://github.com/boto/boto) -[Online documentation](http://readthedocs.org/docs/boto/) is also +[Online documentation](http://docs.pythonboto.org/) is also available. The online documentation includes full API documentation as well as Getting Started Guides for many of the boto modules. -Boto releases can be found on the [Google Project -page](http://code.google.com/p/boto/downloads/list) or on the [Python -Cheese Shop](http://pypi.python.org/). +Boto releases can be found on the [Python Cheese Shop](http://pypi.python.org/). Join our `IRC channel`_ (#boto on FreeNode). IRC channel: http://webchat.freenode.net/?channels=boto @@ -68,6 +67,7 @@ Credentials and other boto-related settings can also be stored in a boto config file. See [this](http://code.google.com/p/boto/wiki/BotoConfig) for details. -Copyright (c) 2006-2011 Mitch Garnaat <mitch@garnaat.com> +Copyright (c) 2006-2012 Mitch Garnaat <mitch@garnaat.com> Copyright (c) 2010-2011, Eucalyptus Systems, Inc. +Copyright (c) 2012 Amazon.com, Inc. or its affiliates. All rights reserved. diff --git a/boto/__init__.py b/boto/__init__.py index bd6e1ffb..15697547 100644 --- a/boto/__init__.py +++ b/boto/__init__.py @@ -1,6 +1,7 @@ -# Copyright (c) 2006-2011 Mitch Garnaat http://garnaat.org/ +# Copyright (c) 2006-2012 Mitch Garnaat http://garnaat.org/ # Copyright (c) 2010-2011, Eucalyptus Systems, Inc. # Copyright (c) 2011, Nexenta Systems Inc. +# Copyright (c) 2012 Amazon.com, Inc. or its affiliates. # All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a @@ -31,7 +32,7 @@ import logging.config import urlparse from boto.exception import InvalidUriError -__version__ = '2.3.0-dev' +__version__ = '2.3.0' Version = __version__ # for backware compatibility UserAgent = 'Boto/%s (%s)' % (__version__, sys.platform) |