Updated version to 2.0.0.

5 files changed, 9 insertions, 7 deletions

diff --git a/COPYING b/COPYING
index 031d7aa344..ec5d96e549 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
-AWX is commercial software licensed to you under an annual agreement from
-AnsibleWorks.
+Ansible Tower is commercial software licensed to you under an annual agreement
+from Ansible, Inc.
 
 It is free for use for up to ten managed servers or virtual instances, after
 which you must purchase a license.
diff --git a/README.md b/README.md
index 5b87cb2471..b559946df0 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Formerly known as awx, ansible-commander and AnsibleWorks, ansible-tower
 provides a web-based user interface, REST API and task engine built on top of
 Ansible.
 
-The current version under development is 1.4.8, and uses the master branch.
+The current version under development is 2.0.0, and uses the master branch.
 
 1.2.2 was the initial version released on July 31, 2013.
 
@@ -17,6 +17,8 @@ The current version under development is 1.4.8, and uses the master branch.
 
 1.4.5 was released on February 10, 2014.
 
+1.4.8 was released on April 7, 2014.
+
 Hotfixes should go on the appropriate release branch and be cherry-picked to
 master.
 
diff --git a/awx/__init__.py b/awx/__init__.py
index 70128a73e5..d62e248add 100644
--- a/awx/__init__.py
+++ b/awx/__init__.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2014 AnsibleWorks, Inc.
 # All Rights Reserved.
 
-__version__ = '1.4.8-0'
+__version__ = '2.0.0-0'
 
 import os
 import sys
diff --git a/awx/api/generics.py b/awx/api/generics.py
index 053cce4bc3..5efd34e9f3 100644
--- a/awx/api/generics.py
+++ b/awx/api/generics.py
@@ -110,7 +110,7 @@ class APIView(views.APIView):
             'new_in_14': getattr(self, 'new_in_14', False),
             'new_in_145': getattr(self, 'new_in_145', False),
             'new_in_148': getattr(self, 'new_in_148', False),
-            'new_in_15': getattr(self, 'new_in_15', False),
+            'new_in_200': getattr(self, 'new_in_200', False),
         }
 
     def get_description(self, html=False):
@@ -127,7 +127,7 @@ class APIView(views.APIView):
         '''
         ret = super(APIView, self).metadata(request)
         added_in_version = '1.2'
-        for version in ('1.5', '1.4.8', '1.4.5', '1.4', '1.3'):
+        for version in ('2.0.0', '1.4.8', '1.4.5', '1.4', '1.3'):
             if getattr(self, 'new_in_%s' % version.replace('.', ''), False):
                 added_in_version = version
                 break
diff --git a/awx/api/templates/api/_new_in_awx.md b/awx/api/templates/api/_new_in_awx.md
index 81e1ee51d3..35bdcc2e58 100644
--- a/awx/api/templates/api/_new_in_awx.md
+++ b/awx/api/templates/api/_new_in_awx.md
@@ -2,4 +2,4 @@
 {% if new_in_14 %}> _Added in AWX 1.4_{% endif %}
 {% if new_in_145 %}> _Added in Ansible Tower 1.4.5_{% endif %}
 {% if new_in_148 %}> _New in Ansible Tower 1.4.8_{% endif %}
-{% if new_in_15 %}> _New in Ansible Tower 1.5_{% endif %}
+{% if new_in_200 %}> _New in Ansible Tower 2.0.0_{% endif %}