Release 1.6.21.6.2

Change-Id: I733c4bcf28d845aa0413ef4af06cdab6bc25cc7b

4 files changed, 28 insertions, 3 deletions

diff --git a/.mailmap b/.mailmap
index 4adf53a..bd0bf20 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,7 +3,8 @@ Kevin Greenan <kmgreen2@gmail.com> <kmg@box.com>
 Eric Lambert <eric_lambert@xyratex.com> <eric.lambert@seagate.com>
 Eric Lambert <eric_lambert@xyratex.com> <eric.d.lambert@gmail.com>
 Tushar Gohad <tushar.gohad@intel.com> <tusharsg@gmail.com>
-Kota Tsuyuzaki <tsuyuzaki.kota@lab.ntt.co.jp> <bloodeagle40234@gmail.com>
+Kota Tsuyuzaki <kota.tsuyuzaki.pc@hco.ntt.co.jp> <bloodeagle40234@gmail.com>
+Kota Tsuyuzaki <kota.tsuyuzaki.pc@hco.ntt.co.jp> <tsuyuzaki.kota@lab.ntt.co.jp>
 Alistair Coles <alistairncoles@gmail.com> <alistair.coles@hpe.com>
 Ondřej Nový <novy@ondrej.org> <ondrej.novy@firma.seznam.cz>
 Thiago da Silva <thiagodasilva@gmail.com> <thiago@redhat.com>
diff --git a/AUTHORS b/AUTHORS
index 75ce234..227461b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,7 +16,7 @@ Andreas Jaeger (aj@suse.com)
 Chris Lamb (lamby@debian.org)
 Dirk Mueller (dirk@dmllr.de)
 James Page (james.page@ubuntu.com)
-Kota Tsuyuzaki (tsuyuzaki.kota@lab.ntt.co.jp)
+Kota Tsuyuzaki (kota.tsuyuzaki.pc@hco.ntt.co.jp)
 Pete Zaitcev (zaitcev@kotori.zaitcev.us)
 gengchc2 (geng.changcai2@zte.com.cn)
 Daniel Axtens (dja@axtens.net)
@@ -24,3 +24,5 @@ Tim Burke (tim.burke@gmail.com)
 John Dickinson (me@not.mn)
 Jim Cheung (jim.cheung@phazr.io)
 Ondřej Nový (novy@ondrej.org)
+Corey Bryant (corey.bryant@canonical.com)
+donnydavis (donny@fortnebula.com)
diff --git a/ChangeLog b/ChangeLog
index 46534ea..30f0fa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Release 1.6.2
+-------------
+
+ . Allow the writing of fragments with the legacy, non-standard CRC-32.
+   This is intended to smooth upgrades from liberasurecode 1.5.0 and
+   earlier in a system with multiple readers and writers.
+
+   See https://bugs.launchpad.net/liberasurecode/+bug/1886088 for more
+   information, including a script you can run on already-written
+   fragments to determine whether you are affected.
+
+   If you are affected:
+
+    - Before upgrading, ensure every writer will have the environment variable
+      LIBERASURECODE_WRITE_LEGACY_CRC=1 set upon restart.
+    - Upgrade liberasurecode on all systems, restarting processes as needed.
+      Upgraded writers will continue writing CRCs that not-yet-upgraded
+      readers can use.
+    - After liberasurecode is upgraded everywhere, remove the environment
+      variable. zlib CRCs will be used for new writes, and data written with
+      either CRC will still be readable.
+
 Release 1.6.1
 -------------
 
diff --git a/include/erasurecode/erasurecode_version.h b/include/erasurecode/erasurecode_version.h
index a3e786b..21a511b 100644
--- a/include/erasurecode/erasurecode_version.h
+++ b/include/erasurecode/erasurecode_version.h
@@ -27,7 +27,7 @@
 
 #define _MAJOR 1
 #define _MINOR 6
-#define _REV 1
+#define _REV 2
 #define _VERSION(x, y, z) ((x << 16) | (y << 8) | (z))
 
 #define LIBERASURECODE_VERSION _VERSION(_MAJOR, _MINOR, _REV)