Merge branch 'master' into develop

dropbox · Jul 11, 2018 · 1e0ccad · 1e0ccad
2 parents 62f5a49 + 71a67f4
commit 1e0ccad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,14 @@ Changelog
 Version History
 ===============
 
+.. _v1.4.0:
+
+1.4.0 (2018-07-10)
+------------------
+
+* Upgrade Django v1.11.11, djangorestframework to v3.7.7
+* Remove django-smart-selects, which is no longer necessary
+
 .. _v1.3.0:
 
 1.3.0 (2018-01-12)

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -39,7 +39,7 @@ RUN pip install -U setuptools
 
 # Try to run this as late as possible for layer caching - this version will be
 # updated every update so let the build not take longer than necessary
-RUN pip install nsot==1.3.0
+RUN pip install nsot==1.4.0
 COPY conf /etc/nsot
 
 ENTRYPOINT ["nsot-server", "--config=/etc/nsot/nsot.conf.py"]

diff --git a/nsot/version.py b/nsot/version.py
@@ -1 +1 @@
-__version__ = '1.3.0'
+__version__ = '1.4.0'