aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-11-22 17:49:53 +0000
committerTom Christie2012-11-22 17:49:53 +0000
commitac84c2ed2e3571b918f6c995a8f753e86c8126f1 (patch)
tree4ec4f96cd21d5cb22490601255aec6c9e95f0138
parentec437e3e0f4dce2c917270bf6b4b0ac06ca68b99 (diff)
downloaddjango-rest-framework-ac84c2ed2e3571b918f6c995a8f753e86c8126f1.tar.bz2
Version 2.1.42.1.4
-rw-r--r--README.md11
-rw-r--r--docs/topics/release-notes.md5
-rw-r--r--rest_framework/__init__.py2
3 files changed, 15 insertions, 3 deletions
diff --git a/README.md b/README.md
index 9a12d535..2743dd3e 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,17 @@ To run the tests.
# Changelog
+## 2.1.4
+
+**Date**: 22nd Nov 2012
+
+* Support for partial updates with serializers.
+* Added `RegexField`.
+* Added `SerializerMethodField`.
+* Serializer performance improvements.
+* Added `obtain_token_view` to get tokens when using `TokenAuthentication`.
+* Bugfix: Django 1.5 configurable user support for `TokenAuthentication`.
+
## 2.1.3
**Date**: 16th Nov 2012
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 9235dada..fe5466be 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -4,7 +4,9 @@
>
> — Eric S. Raymond, [The Cathedral and the Bazaar][cite].
-## Master
+## 2.1.4
+
+**Date**: 22nd Nov 2012
* Support for partial updates with serializers.
* Added `RegexField`.
@@ -17,7 +19,6 @@
**Date**: 16th Nov 2012
-* Support for partial updates with serializers.
* Added `FileField` and `ImageField`. For use with `MultiPartParser`.
* Added `URLField` and `SlugField`.
* Support for `read_only_fields` on `ModelSerializer` classes.
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 88108a8d..a2233f3d 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '2.1.3'
+__version__ = '2.1.4'
VERSION = __version__ # synonym