aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-12-31 08:53:49 +0000
committerTom Christie2012-12-31 08:53:49 +0000
commiteff833b39d2f41c9eb773214f5b45c3d991e1511 (patch)
tree4fe8eb79a35d9e7392f7faa325bceffb33add8e6
parent8fad0a727a897970531a087346ecd44f361b25f4 (diff)
downloaddjango-rest-framework-eff833b39d2f41c9eb773214f5b45c3d991e1511.tar.bz2
Version 2.1.142.1.14
-rw-r--r--README.md12
-rw-r--r--docs/topics/release-notes.md9
-rw-r--r--rest_framework/__init__.py2
3 files changed, 21 insertions, 2 deletions
diff --git a/README.md b/README.md
index c262cd68..e1d85f3c 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,18 @@ To run the tests.
# Changelog
+### 2.1.14
+
+**Date**: 31st Dec 2012
+
+* Bugfix: ModelSerializers now include reverse FK fields on creation.
+* Bugfix: Model fields with `blank=True` are now `required=False` by default.
+* Bugfix: Nested serializers now support nullable relationships.
+
+**Note**: From 2.1.14 onwards, relational fields move out of the `fields.py` module and into the new `relations.py` module, in order to seperate them from regular data type fields, such as `CharField` and `IntegerField`.
+
+This change will not affect user code, so long as it's following the recommended import style of `from rest_framework import serializers` and refering to fields using the style `serializers.PrimaryKeyRelatedField`.
+
### 2.1.13
**Date**: 28th Dec 2012
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 3ca3e6b3..c93eebac 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -16,12 +16,19 @@ Major version numbers (x.0.0) are reserved for project milestones. No major poi
## 2.1.x series
-### Master
+### 2.1.14
+
+**Date**: 31st Dec 2012
* Bugfix: ModelSerializers now include reverse FK fields on creation.
* Bugfix: Model fields with `blank=True` are now `required=False` by default.
* Bugfix: Nested serializers now support nullable relationships.
+**Note**: From 2.1.14 onwards, relational fields move out of the `fields.py` module and into the new `relations.py` module, in order to seperate them from regular data type fields, such as `CharField` and `IntegerField`.
+
+This change will not affect user code, so long as it's following the recommended import style of `from rest_framework import serializers` and refering to fields using the style `serializers.PrimaryKeyRelatedField`.
+
+
### 2.1.13
**Date**: 28th Dec 2012
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 2e38d863..151ba832 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '2.1.13'
+__version__ = '2.1.14'
VERSION = __version__ # synonym