Merge remote-tracking branch 'upstream/master'

This commit is contained in:
jleute 2018-06-12 00:27:08 +02:00
commit 0dbd15df7b
2 changed files with 2 additions and 2 deletions

View file

@ -1,6 +1,6 @@
import logging
__version__ = "0.20.0rc13"
__version__ = "0.20.0rc14"
version = tuple(__version__.split('.'))
logging.getLogger(__name__).addHandler(logging.NullHandler())

View file

@ -297,7 +297,7 @@ ADJUSTABLE_SETTINGS = {
'use_keyring': (bool, False),
'wallet': (str, LBRYUM_WALLET),
'blockchain_name': (str, 'lbrycrd_main'),
'lbryum_servers': (list, [('lbryum8.lbry.io', 50001), ('lbryum9.lbry.io',
'lbryum_servers': (list, [('lbryumx1.lbry.io', 50001), ('lbryumx2.lbry.io',
50001)], server_list, server_list_reverse),
's3_headers_depth': (int, 96 * 10) # download headers from s3 when the local height is more than 10 chunks behind
}