Merge pull request #2772 from nipy/rel/1.1.5

REL: 1.1.5
nipy · Nov 8, 2018 · a5c7922 · a5c7922
2 parents cfb5aba + 32543d4
commit a5c7922
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog
@@ -1,3 +1,14 @@
+1.1.5 (November 08, 2018)
+=========================
+
+Hotfix release.
+
+##### [Full changelog](https://github.com/nipy/nipype/milestone/26?closed=1)
+
+  * ENH: Allow timeouts during SLURM job status checks (https://github.com/nipy/nipype/pull/2767)
+  * RF: Subclass non-daemon variants of all multiprocessing contexts (https://github.com/nipy/nipype/pull/2771)
+
+
 1.1.4 (October 31, 2018)
 ========================
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -82,7 +82,7 @@
 # The short X.Y version.
 version = nipype.__version__
 # The full version, including alpha/beta/rc tags.
-release = "1.1.4"
+release = "1.1.5"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/nipype/info.py b/nipype/info.py
@@ -11,7 +11,7 @@
 # full release.  '.dev' as a version_extra string means this is a development
 # version
 # Remove -dev for release
-__version__ = '1.1.5-dev'
+__version__ = '1.1.5'
 
 
 def get_nipype_gitversion():