aboutsummaryrefslogtreecommitdiff
path: root/src/rpcserver.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2014-11-18 14:29:38 -0500
committerGavin Andresen <gavinandresen@gmail.com>2014-11-18 14:31:29 -0500
commitfd3777b0b272ad4ce7fbb152917353aa46879f89 (patch)
tree2c5a27dbd19273204fb4544f3807813863f8cc87 /src/rpcserver.cpp
parente3560029ceb7899b6c8a9d59d803de7190ff65bd (diff)
parent3c30f27f342c15af17c6f7e160be5ee60f28194d (diff)
downloadbitcoin-fd3777b0b272ad4ce7fbb152917353aa46879f89.tar.xz
Merge pull request #5280
3c30f27 travis: disable rpc tests for windows until they're not so flaky (Cory Fields) daf03e7 RPC tests: create initial chain with specific timestamps (Gavin Andresen) a8b2ce5 regression test only setmocktime RPC call (Gavin Andresen)
Diffstat (limited to 'src/rpcserver.cpp')
-rw-r--r--src/rpcserver.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 8b042e6003..01005c1cee 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -246,6 +246,7 @@ static const CRPCCommand vRPCCommands[] =
{ "control", "getinfo", &getinfo, true, false, false }, /* uses wallet if enabled */
{ "control", "help", &help, true, true, false },
{ "control", "stop", &stop, true, true, false },
+ { "control", "setmocktime", &setmocktime, true, false, false },
/* P2P networking */
{ "network", "getnetworkinfo", &getnetworkinfo, true, false, false },