Bump version and sync with upstream

milind-shakya-sp · milind-shakya-sp · commit db9f2e15fbee · 2018-12-10T17:25:40.000-05:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.0
+current_version = 1.4.0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<releaselevel>[a-z]+)?
diff --git a/Changelog b/Changelog
@@ -4,6 +4,16 @@
  Change history
 ================
 
+.. _version-1.4.0:
+
+1.4.0
+=====
+:release-date: 2018-12-09 1:30 p.m. UTC+2:00
+:release-by: Omer Katz
+
+- Fix migrations dependencies.
+- Added the DJANGO_CELERY_BEAT_TZ_AWARE setting.
+
 .. _version-1.3.0:
 
 1.3.0
diff --git a/README.rst b/README.rst
@@ -8,7 +8,7 @@
 
 |build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
 
-:Version: 1.3.0
+:Version: 1.4.0
 :Web: http://django-celery-beat.readthedocs.io/
 :Download: http://pypi.python.org/pypi/django-celery-beat
 :Source: http://github.com/celery/django-celery-beat
diff --git a/django_celery_beat/__init__.py b/django_celery_beat/__init__.py
@@ -10,7 +10,7 @@
 
 from collections import namedtuple
 
-__version__ = '1.3.0+singleplatform.1'
+__version__ = '1.4.0+singleplatform.1'
 __author__ = 'Ask Solem'
 __contact__ = 'ask@celeryproject.org'
 __homepage__ = 'https://github.com/celery/django-celery-beat'
diff --git a/docs/includes/introduction.txt b/docs/includes/introduction.txt
@@ -1,4 +1,4 @@
-:Version: 1.3.0
+:Version: 1.4.0
 :Web: http://django-celery-beat.readthedocs.io/
 :Download: http://pypi.python.org/pypi/django-celery-beat
 :Source: http://github.com/celery/django-celery-beat

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-:Version: 1.3.0`
	`1`	`+:Version: 1.4.0`
`2`	`2`	`:Web: http://django-celery-beat.readthedocs.io/`
`3`	`3`	`:Download: http://pypi.python.org/pypi/django-celery-beat`
`4`	`4`	`:Source: http://github.com/celery/django-celery-beat`