Merge branch 'master' of github.com:BroganD1993/ec2stack

apache · Jul 5, 2014 · 6f94bae · 6f94bae
2 parents 28d4ccf + a549fdd
commit 6f94bae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,6 +1,12 @@
 History
 =======
 
+0.4.0 (9-06-2014)
+__________________
+
+* Make api version used in responses dynamic
+
+
 0.3.0 (8-06-2014)
 __________________
 

diff --git a/README.rst b/README.rst
@@ -5,11 +5,11 @@ EC2STACK
 An EC2 Compatibility Interface For Apache Cloudstack
 ####################################################
 
-.. image:: https://api.travis-ci.org/BroganD1993/ec2stack.png
-    :target: https://travis-ci.org/BroganD1993/ec2stack
 .. image:: https://badge.fury.io/py/ec2stack.png
     :target: https://pypi.python.org/pypi/ec2stack
-.. image:: https://coveralls.io/repos/BroganD1993/ec2stack/badge.png
+.. image:: https://api.travis-ci.org/BroganD1993/ec2stack.png?branch=master
+    :target: https://travis-ci.org/BroganD1993/ec2stack
+.. image:: https://coveralls.io/repos/BroganD1993/ec2stack/badge.png?branch=master
     :target: https://coveralls.io/r/BroganD1993/ec2stack
 
 Description
@@ -26,4 +26,4 @@ Bridging Apache Cloudstack with existing public cloud providers APIs is needed i
 Usage
 -----
 
-Please see the Software User Manual (https://github.com/imduffy15/ec2stack/wiki/Software-User-Manual)
+Please see the Software User Manual (https://github.com/brogand1993/ec2stack/wiki/Software-User-Manual)
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@ def read_file(name):
 DESC = "EC2 compatibility interface for Apache Cloudstack"
 LONG_DESC = read_file('README.rst')
 REQUIRES = [
-    'Flask-SQLAlchemy', 'flask', 'Requests', 'alembic'
+    'Flask-SQLAlchemy', 'flask', 'requests', 'alembic'
 ]
 
 setup(