Merge branch '2.0-release' into 'master'

Post Release: 2.0.0 See merge request !202

Merge branch '2.0-release' into 'master'
Post Release: 2.0.0 See merge request !202
79882b95 · Lukas Riedel · 77874f2e · d7a4bdee · 79882b95 · 79882b95
Commit 79882b95 authored May 14, 2020 by Lukas Riedel
Showing with 8 additions and 4 deletions

.gitlab/merge_request_templates/post-release.md .gitlab/merge_request_templates/post-release.md +2 -2

CHANGELOG.md CHANGELOG.md +4 -0

VERSION VERSION +1 -1

dune.module dune.module +1 -1

No files found.
--- a/.gitlab/merge_request_templates/post-release.md
+++ b/.gitlab/merge_request_templates/post-release.md
@@ -9,8 +9,8 @@ The release is coordinated in issue #

 ### Tasks

- [ ] Update version numbers in `VERSION`, `CHANGELOG.md`, `dune.module` to
-    `X.Y+1-pre`.
+- [ ] Update version numbers in `VERSION` and `dune.module` to `X.Y+1-pre`
+- [ ] Add new "Unreleased" section in `CHANGELOG.md`

 ### Can this MR be merged?


--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@

 ## 2.0.0 (2020-05-14)

+<!-- Add new entries here! -->
+
+## 2.0.0 (2020-05-14)
+
 ### Added

 * [`yaml-cpp`](https://github.com/jbeder/yaml-cpp/) v5.2.0 or greater as

--- a/VERSION
+++ b/VERSION
-2.0.0
+2.1-pre
--- a/dune.module
+++ b/dune.module
@@ -4,7 +4,7 @@

 #Name of the module
 Module: dorie
-Version: 2.0.0
+Version: 2.1-pre
 Maintainer: dorieteam@iup.uni-heidelberg.de
 #depending on
 Depends: dune-pdelab dune-uggrid dune-randomfield