ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into misc

Browse Source 
Conflicts:
	src/TransactionEngine.cpp
This commit is contained in:
Arthur Britto
2012-06-05 13:08:36 -07:00
parent ba983ccec3 a987613595
commit 480482d618
7 changed files with 82 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/RPCServer.cpp
View File

@@ -1279,8 +1279,8 @@ Json::Value RPCServer::doLedger(Json::Value& params)
if (getParamCount(params)== 0)
{
Json::Value ret(Json::objectValue), current(Json::objectValue), closed(Json::objectValue);
theApp->getMasterLedger().getCurrentLedger()->addJson(current);
theApp->getMasterLedger().getClosedLedger()->addJson(closed);
theApp->getMasterLedger().getCurrentLedger()->addJson(current, 0);
theApp->getMasterLedger().getClosedLedger()->addJson(closed, 0);
ret["open"] = current;
ret["closed"] = closed;
return ret;