Merge branch 'master' into check-updates

2016-12-14 14:37:38 +01:00
parent a8f428ccca 1a9a142a69
commit 2588aea6b2
38 changed files with 506 additions and 154 deletions
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -280,7 +280,7 @@ Footprint Options:
                           of all accounts and storage keys. Doubles the size
                           of the state database. BOOL may be one of on, off
                           or auto. (default: {flag_fat_db})
-  --scale-verifiers        Automatically scale amount of verifier threads based on 
+  --scale-verifiers        Automatically scale amount of verifier threads based on
                           workload. Not guaranteed to be faster.
                           (default: {flag_scale_verifiers})
  --num-verifiers INT      Amount of verifier threads to use or to begin with, if verifier