diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-06-15 09:39:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-06-15 09:39:30 +0200 |
| commit | 5ebe7db6d00df4996f98c8b60b18bfef6222c9b7 (patch) | |
| tree | a3b68ab47e53ffe8b54432e03c138deb885fe7bf /src/rpcnet.cpp | |
| parent | Merge pull request #6276 (diff) | |
| parent | Add paytxfee to getwalletinfo, warnings to getnetworkinfo (diff) | |
| download | discoin-5ebe7db6d00df4996f98c8b60b18bfef6222c9b7.tar.xz discoin-5ebe7db6d00df4996f98c8b60b18bfef6222c9b7.zip | |
Merge pull request #6257
ef2a3de Add paytxfee to getwalletinfo, warnings to getnetworkinfo (Stephen)
Diffstat (limited to 'src/rpcnet.cpp')
| -rw-r--r-- | src/rpcnet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index a36831de2..c4e038eeb 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -408,6 +408,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp) " }\n" " ,...\n" " ]\n" + " \"warnings\": \"...\" (string) any network warnings (such as alert messages) \n" "}\n" "\nExamples:\n" + HelpExampleCli("getnetworkinfo", "") @@ -439,5 +440,6 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp) } } obj.push_back(Pair("localaddresses", localAddresses)); + obj.push_back(Pair("warnings", GetWarnings("statusbar"))); return obj; } |