diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:16:24 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:16:24 +0000 |
| commit | cef36fad891fba0fd8f5aec73bb17135b7fb133a (patch) | |
| tree | 43eeae2dd9003ae894603bbb315ee2c3e40b9097 /src/bitcoinrpc.cpp | |
| parent | a7642282f6465f2d9e2091ec6279fa1db1241cf3 (diff) | |
| parent | b3f8f6ab9409d3e901d22c09b0346a5a47779496 (diff) | |
| download | bitcoin-cef36fad891fba0fd8f5aec73bb17135b7fb133a.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/bitcoinrpc.cpp
src/init.cpp
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 9c9ff255d7..7cee356179 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1589,7 +1589,7 @@ Value encryptwallet(const Array& params, bool fHelp) // slack space in .dat files; that is bad if the old data is // unencrypted private keys. So: StartShutdown(); - return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet"; + return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; } |