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
This commit is contained in:
mdr0id 2018-11-29 10:55:44 -08:00
parent 4336741c35
commit 6f8d182f50
2 changed files with 3 additions and 1 deletions

View File

@ -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);

View File

@ -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):