From 6f8d182f502be899e4d4fd32bfa1ae1798eb00a8 Mon Sep 17 00:00:00 2001
From: mdr0id <marshall@z.cash>
Date: Thu, 29 Nov 2018 10:55:44 -0800
Subject: [PATCH] Add Charlie and Ariel alias to author_aliases

Update approx_release_height to allow pre-rel to get into master prior

Bump APPROX_RELEASE_HEIGHT due to transient failures in pre-release 2.0.2 PR
---
 src/deprecation.h       | 2 +-
 zcutil/release-notes.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/deprecation.h b/src/deprecation.h
index c1d8d4075..96368809c 100644
--- a/src/deprecation.h
+++ b/src/deprecation.h
@@ -8,7 +8,7 @@
 // Deprecation policy:
 // * Shut down 16 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 437520;
+static const int APPROX_RELEASE_HEIGHT = 438196;
 static const int WEEKS_UNTIL_DEPRECATION = 16;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
 
diff --git a/zcutil/release-notes.py b/zcutil/release-notes.py
index 4807f84e6..01171ec10 100755
--- a/zcutil/release-notes.py
+++ b/zcutil/release-notes.py
@@ -23,6 +23,8 @@ author_aliases = {
     'Simon': 'Simon Liu',
     'bitcartel': 'Simon Liu',
     'EthanHeilman': 'Ethan Heilman',
+    'arielgabizon' : 'Ariel Gabizon',
+    'Charlie OKeefe' : 'Charlie O\'Keefe',
 }
 
 def apply_author_aliases(name):