Auto merge of #2007 - bitcartel:1097_copyright_notice_and_date, r=bitcartel

Closes #1097 so that zcash-cli displays license info like zcashd. LicenseInfo is refactored from init.cpp to util.cpp so that the bitcoin-cli makefile target does not need to be modified.
2017-01-19 00:56:47 +00:00
parent 4458f87138 774489569a
commit 78674ca79e
6 changed files with 19 additions and 16 deletions
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -301,7 +301,7 @@ class WalletTest (BitcoinTestFramework):
        opids = []
        opids.append(myopid)

-        timeout = 120
+        timeout = 300
        status = None
        for x in xrange(1, timeout):
            results = self.nodes[2].z_getoperationresult(opids)