From 83cf00f9eb96b302edda1bbde4a1802b76007ce6 Mon Sep 17 00:00:00 2001
From: Peter Hill <zed.three@gmail.com>
Date: Fri, 1 Dec 2017 09:33:11 +0000
Subject: [PATCH] Bump version to 4.1.2, update changelog

---
 CHANGELOG.md          | 77 +++++++++++++++++++++++++++++++++++++++++++
 configure             | 22 ++++++-------
 configure.ac          |  2 +-
 manual/sphinx/conf.py |  2 +-
 4 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 797f19bd0f..734ef44576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,82 @@
 # Change Log
 
+## [v4.1.2](https://github.com/boutproject/BOUT-dev/tree/v4.1.2) (2017-12-01)
+[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.1.1...v4.1.2)
+
+**Fixed bugs:**
+
+- ./configure deadlock [\#744](https://github.com/boutproject/BOUT-dev/issues/744)
+- Typo in unit test makefile? [\#730](https://github.com/boutproject/BOUT-dev/issues/730)
+- Laplacian Serial\_tri incorrect operation [\#727](https://github.com/boutproject/BOUT-dev/issues/727)
+- memory leak in pylib/boututils/showdata [\#231](https://github.com/boutproject/BOUT-dev/issues/231)
+- Fix minor typo in unit test makefile [\#731](https://github.com/boutproject/BOUT-dev/pull/731) ([d7919](https://github.com/d7919))
+
+**Closed issues:**
+
+- Test fci-slab [\#748](https://github.com/boutproject/BOUT-dev/issues/748)
+- BOUT.log is hardcoded [\#745](https://github.com/boutproject/BOUT-dev/issues/745)
+- FFT for DDZ hard coded parameters [\#647](https://github.com/boutproject/BOUT-dev/issues/647)
+- genZMode no longer used? [\#645](https://github.com/boutproject/BOUT-dev/issues/645)
+- Vector applyBoundary [\#584](https://github.com/boutproject/BOUT-dev/issues/584)
+
+**Merged pull requests:**
+
+- Bug fix bout runners [\#758](https://github.com/boutproject/BOUT-dev/pull/758) ([loeiten](https://github.com/loeiten))
+- Fix bug in infinite recursion in configure when netcdf not found [\#754](https://github.com/boutproject/BOUT-dev/pull/754) ([ZedThree](https://github.com/ZedThree))
+- disable plotting in test-fci-slab [\#753](https://github.com/boutproject/BOUT-dev/pull/753) ([dschwoerer](https://github.com/dschwoerer))
+- Fixing bug in calculation of non-uniform correction [\#739](https://github.com/boutproject/BOUT-dev/pull/739) ([bendudson](https://github.com/bendudson))
+- Laplacexy examples fix [\#733](https://github.com/boutproject/BOUT-dev/pull/733) ([bendudson](https://github.com/bendudson))
+- Small fixes for serial\_tri Laplace solver [\#729](https://github.com/boutproject/BOUT-dev/pull/729) ([bendudson](https://github.com/bendudson))
+- Adding missing \_\_setitem\_\_ and keys\(\) functions [\#728](https://github.com/boutproject/BOUT-dev/pull/728) ([bendudson](https://github.com/bendudson))
+- Manual fix [\#721](https://github.com/boutproject/BOUT-dev/pull/721) ([dschwoerer](https://github.com/dschwoerer))
+
+## [v4.1.1](https://github.com/boutproject/BOUT-dev/tree/v4.1.1) (2017-10-18)
+[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.1.0...v4.1.1)
+
+**Fixed bugs:**
+
+- Generalise the "boundaries" section of Delp2 for Field3D [\#708](https://github.com/boutproject/BOUT-dev/pull/708) ([d7919](https://github.com/d7919))
+- Cleanup array :: cleanup all at end of sim [\#706](https://github.com/boutproject/BOUT-dev/pull/706) ([d7919](https://github.com/d7919))
+- Ensure VarStr entries are initialised in all cases [\#705](https://github.com/boutproject/BOUT-dev/pull/705) ([d7919](https://github.com/d7919))
+- Initialise `covar` for all `VarStr` instances [\#704](https://github.com/boutproject/BOUT-dev/pull/704) ([d7919](https://github.com/d7919))
+- Removing Field3D move constructor [\#699](https://github.com/boutproject/BOUT-dev/pull/699) ([bendudson](https://github.com/bendudson))
+- Field3D default move constructor leading to segfaults [\#698](https://github.com/boutproject/BOUT-dev/issues/698)
+- Unit test seg fault \(`Output::cleanup`\) -- order dependent [\#693](https://github.com/boutproject/BOUT-dev/issues/693)
+- test-fci-slab fix: Don't show plot by default [\#692](https://github.com/boutproject/BOUT-dev/pull/692) ([d7919](https://github.com/d7919))
+
+**Closed issues:**
+
+- Integrated tests don't all compile and not all used [\#701](https://github.com/boutproject/BOUT-dev/issues/701)
+- PYTHONPATH in tests [\#695](https://github.com/boutproject/BOUT-dev/issues/695)
+- Dynamic casts in `ConditionalOutput` [\#691](https://github.com/boutproject/BOUT-dev/issues/691)
+- Segfault when increasing verbosity  [\#690](https://github.com/boutproject/BOUT-dev/issues/690)
+- v4.1 release candidate [\#640](https://github.com/boutproject/BOUT-dev/issues/640)
+- -DCHECK changes memory layout [\#594](https://github.com/boutproject/BOUT-dev/issues/594)
+- nx and ny constant for different processors [\#560](https://github.com/boutproject/BOUT-dev/issues/560)
+- release notes [\#504](https://github.com/boutproject/BOUT-dev/issues/504)
+- y initial conditions always at CELL\_YLOW [\#484](https://github.com/boutproject/BOUT-dev/issues/484)
+- Free boundaries [\#429](https://github.com/boutproject/BOUT-dev/issues/429)
+- Adding TRACE and BoutException to monitors [\#355](https://github.com/boutproject/BOUT-dev/issues/355)
+- indexDDZ \(staggered\) [\#335](https://github.com/boutproject/BOUT-dev/issues/335)
+- Reducing compiler warnings [\#322](https://github.com/boutproject/BOUT-dev/issues/322)
+- Derivatives: free boundary - Issues if MXG not 2 [\#250](https://github.com/boutproject/BOUT-dev/issues/250)
+
+**Merged pull requests:**
+
+- Fix broken links, code blocks and tables in documentation [\#722](https://github.com/boutproject/BOUT-dev/pull/722) ([ZedThree](https://github.com/ZedThree))
+- Small bug fixes for Options/OptionsReader and their tests [\#718](https://github.com/boutproject/BOUT-dev/pull/718) ([ZedThree](https://github.com/ZedThree))
+- Update user manual: --enable-checks is the configure option for checking [\#717](https://github.com/boutproject/BOUT-dev/pull/717) ([JosephThomasParker](https://github.com/JosephThomasParker))
+- Make sure link flags apply correctly to unit tests [\#715](https://github.com/boutproject/BOUT-dev/pull/715) ([ZedThree](https://github.com/ZedThree))
+- throw exception if staggererd deriv in z direction [\#714](https://github.com/boutproject/BOUT-dev/pull/714) ([dschwoerer](https://github.com/dschwoerer))
+- Set PYTHONPATH for tests [\#713](https://github.com/boutproject/BOUT-dev/pull/713) ([ZedThree](https://github.com/ZedThree))
+- A few small fixes and tests for Output/ConditionalOutput [\#712](https://github.com/boutproject/BOUT-dev/pull/712) ([ZedThree](https://github.com/ZedThree))
+- Output message if NetCDF4 support is enabled [\#711](https://github.com/boutproject/BOUT-dev/pull/711) ([ZedThree](https://github.com/ZedThree))
+- Make bout\_test\_main.o depend on source file [\#710](https://github.com/boutproject/BOUT-dev/pull/710) ([ZedThree](https://github.com/ZedThree))
+- Make shiftedmetric use const refs when possible [\#703](https://github.com/boutproject/BOUT-dev/pull/703) ([d7919](https://github.com/d7919))
+- Some fixes to the integrated tests [\#702](https://github.com/boutproject/BOUT-dev/pull/702) ([bendudson](https://github.com/bendudson))
+- Add an option "ddz:fft\_filter" to control filtering in DDZ [\#700](https://github.com/boutproject/BOUT-dev/pull/700) ([bendudson](https://github.com/bendudson))
+- Multigrid solver memory leak bugfix [\#696](https://github.com/boutproject/BOUT-dev/pull/696) ([johnomotani](https://github.com/johnomotani))
+- Bugfix: Checkout googletest if not available [\#694](https://github.com/boutproject/BOUT-dev/pull/694) ([bendudson](https://github.com/bendudson))
 
 ## [v4.1.0](https://github.com/boutproject/BOUT-dev/tree/v4.1.0) (2017-09-20)
 [Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.0.1...v4.1.0)
diff --git a/configure b/configure
index d3c613d081..c440c3570f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for BOUT++ 4.1.1.
+# Generated by GNU Autoconf 2.69 for BOUT++ 4.1.2.
 #
 # Report bugs to <bd512@york.ac.uk>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='BOUT++'
 PACKAGE_TARNAME='bout--'
-PACKAGE_VERSION='4.1.1'
-PACKAGE_STRING='BOUT++ 4.1.1'
+PACKAGE_VERSION='4.1.2'
+PACKAGE_STRING='BOUT++ 4.1.2'
 PACKAGE_BUGREPORT='bd512@york.ac.uk'
 PACKAGE_URL=''
 
@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures BOUT++ 4.1.1 to adapt to many kinds of systems.
+\`configure' configures BOUT++ 4.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1399,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of BOUT++ 4.1.1:";;
+     short | recursive ) echo "Configuration of BOUT++ 4.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1522,7 +1522,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-BOUT++ configure 4.1.1
+BOUT++ configure 4.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2103,7 +2103,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by BOUT++ $as_me 4.1.1, which was
+It was created by BOUT++ $as_me 4.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -15853,7 +15853,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by BOUT++ $as_me 4.1.1, which was
+This file was extended by BOUT++ $as_me 4.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15906,7 +15906,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-BOUT++ config.status 4.1.1
+BOUT++ config.status 4.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17077,7 +17077,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by BOUT++ $as_me 4.1.1, which was
+This file was extended by BOUT++ $as_me 4.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17130,7 +17130,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-BOUT++ config.status 4.1.1
+BOUT++ config.status 4.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 8894c3d1fd..2342f287d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT(BOUT++, 4.1.1, bd512@york.ac.uk)
+AC_INIT(BOUT++, 4.1.2, bd512@york.ac.uk)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/manual/sphinx/conf.py b/manual/sphinx/conf.py
index e44691447a..274ee67628 100755
--- a/manual/sphinx/conf.py
+++ b/manual/sphinx/conf.py
@@ -109,7 +109,7 @@
 # The short X.Y version.
 version = '4.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.1'
+release = '4.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.