summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2012-03-15 03:29:49 +0000
committerJames Bennett <ubernostrum@gmail.com>2012-03-15 03:29:49 +0000
commite6ae858811ab880c18069dbd0055bddee85b45ba (patch)
tree287ddd3248bd67e5c062584af994062c39bda1a4
parenta935e834433cfc691882c2bbf1249a39abecd35b (diff)
Bump trunk to 1.4 RC 2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 8ba079685e..34cb7db6a6 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 0, 'rc', 1)
+VERSION = (1, 4, 0, 'rc', 2)
def get_version(version=None):
"""Derives a PEP386-compliant version number from VERSION."""
diff --git a/docs/conf.py b/docs/conf.py
index c43c998704..e845faca7b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -52,7 +52,7 @@ copyright = 'Django Software Foundation and contributors'
# The short X.Y version.
version = '1.4'
# The full version, including alpha/beta/rc tags.
-release = '1.4 rc 1'
+release = '1.4 rc 2'
# The next version to be released
django_next_version = '1.4'
diff --git a/setup.py b/setup.py
index 9e25cfe99d..745f2e9d27 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(
author = 'Django Software Foundation',
author_email = 'foundation@djangoproject.com',
description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
- download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4c1.tar.gz',
+ download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4c2.tar.gz',
packages = packages,
cmdclass = cmdclasses,
data_files = data_files,