Merge pull request #188 from benjeffery/release_prep2

Release prep
tskit-dev · Mar 1, 2022 · 85fb640 · 85fb640
2 parents be10379 + 2bb91f4
commit 85fb640
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/c/CHANGELOG.rst b/c/CHANGELOG.rst
@@ -1,3 +1,15 @@
+--------------------
+[2.1.1] - 2021-03-01
+--------------------
+
+- Minor bug-release and maintenance update.
+
+- Fix assertion triggered when NULL was passed along with KAS_BORROWS_ARRAY.
+  (:user:`benjeffery`, :pr:`185`)
+
+- Move VERSION to VERSION.txt to prevent issues on macos.
+  (:user:`benjeffery`, :pr:`187`, :issue:`186`)
+
 --------------------
 [2.1.0] - 2022-01-25
 --------------------

diff --git a/c/VERSION.txt b/c/VERSION.txt
@@ -1 +1 @@
-2.1.0
+2.1.1