Commit Graph

6459 Commits

Author SHA1 Message Date
JoelKatz
37fe9a6098 Merge branch 'master' into develop
Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj
	modules/ripple_app/ripple_app.cpp
	modules/ripple_websocket/ripple_websocket.cpp
	src/cpp/ripple/NetworkOPs.cpp
	src/cpp/ripple/ripple_Application.cpp
	src/cpp/ripple/ripple_Peer.cpp
2013-07-07 15:28:18 -07:00
JoelKatz
f9b282b424 Fix conflict. 2013-07-07 15:13:38 -07:00
JoelKatz
fca9a4abe4 Fix some possible cases where a node could be marked as full below when it shouldn't be. 2013-07-07 15:11:34 -07:00
JoelKatz
31291598ea Fix a bug in RangeSet::clearValue 2013-07-07 15:10:05 -07:00
JoelKatz
009fa899a9 Remove the compaction delay. Somehow it's not helping. 2013-07-07 15:07:34 -07:00
JoelKatz
dc08a9061e Fix some possible cases where a node could be marked as full below when it shouldn't be. 2013-07-06 12:35:18 -07:00
JoelKatz
fe3deb750a Merge branch 'develop' of github.com:ripple/rippled into develop 2013-07-05 06:18:53 -07:00
JoelKatz
3ecc6c8745 This looks like the right fix. 2013-07-05 06:18:16 -07:00
JoelKatz
6f90ed259b This looks like the right fix. 2013-07-05 06:17:32 -07:00
JoelKatz
be68458aff Some cleanups. 2013-07-05 03:34:24 -07:00
JoelKatz
1fb4106f2f Hotfix: Reverse assumes forward expires offers. Forward doesn't. 2013-07-05 02:17:56 -07:00
Vinnie Falco
bdbeabde4a Remove unnecessary assignment 2013-07-04 13:59:37 -07:00
Vinnie Falco
5dcbc92259 Really fix prevMissing 2013-07-04 13:53:03 -07:00
Vinnie Falco
026514157d Yet another RangeSet fix 2013-07-04 08:04:57 -07:00
JoelKatz
e65027bded This is the right fix. 2013-07-04 00:31:21 -07:00
JoelKatz
d664e614b8 This is the right fix. 2013-07-04 00:30:56 -07:00
JoelKatz
24745e9d82 Merge branch 'master' of github.com:ripple/rippled 2013-07-04 00:26:52 -07:00
JoelKatz
89b4d70cd4 Fix a bug in RangeSet::clearValue 2013-07-04 00:26:27 -07:00
JoelKatz
ce3e6db181 RangeSet bugfixes. 2013-07-04 00:25:38 -07:00
Vinnie Falco
4a5d3a0f09 Fix for prevMissing 2013-07-03 23:39:18 -07:00
Vinnie Falco
d79111353d Debug consistency checker for RangeSet 2013-07-03 23:16:12 -07:00
JoelKatz
b4d5b8137c One step towards fixing this. We need asserts and logging. 2013-07-03 20:38:33 -07:00
JoelKatz
9f3ae416f7 beast, not BEAST 2013-07-03 18:39:49 -07:00
JoelKatz
89ea36fa07 Merge branch 'feature-cleanup' of github.com:vinniefalco/rippled into develop 2013-07-03 18:36:17 -07:00
JoelKatz
1e6f898ac1 Merge branch 'develop' of github.com:ripple/rippled into develop 2013-07-03 18:33:08 -07:00
Vinnie Falco
a150d771b6 Fix config-example for local signing 2013-07-03 13:48:49 -07:00
Vinnie Falco
c0351e959a Fix config-example for local signing 2013-07-03 13:48:31 -07:00
JoelKatz
d303e7dba8 Shed load if the ledger publication engine is falling behind. 2013-07-03 13:20:27 -07:00
JoelKatz
bc5781e05d Load manager fixes. 2013-07-03 12:36:37 -07:00
JoelKatz
da9cd1dcfe Missing return in previous commit. 2013-07-03 11:36:18 -07:00
JoelKatz
699ac3d256 Raise default hold time. 2013-07-03 11:23:58 -07:00
JoelKatz
c9b8009e3a Avoid relaying very old transactions 2013-07-03 11:16:14 -07:00
Vinnie Falco
48cd904988 Various beast cleanups 2013-07-03 10:07:46 -07:00
Vinnie Falco
69d1771ef6 Fix unused function warning 2013-07-03 10:05:43 -07:00
Vinnie Falco
46222af7df Fix beast macro calls 2013-07-03 10:05:43 -07:00
Vinnie Falco
47ceb0440d Streamline ILoadManager interface 2013-07-03 10:05:38 -07:00
JoelKatz
dd431b47f5 Typo 2013-07-03 09:46:52 -07:00
JoelKatz
537b0f1088 Temporary workaround. 2013-07-03 09:43:21 -07:00
Vinnie Falco
7a1bc5435e Add neverDestroyed lifetime for SharedSingleton 2013-07-03 09:41:46 -07:00
Vinnie Falco
147e0e78b9 Fix for atomic aliasing in Clang or GCC builds 2013-07-03 09:41:46 -07:00
Vinnie Falco
ec672b939b constness fix in OwnedArray 2013-07-03 09:41:46 -07:00
Vinnie Falco
ca3ef3881f Add new ripple_app parts to SConstruct 2013-07-03 09:41:45 -07:00
Vinnie Falco
8497597d91 Break ripple_app module into 8 pieces (from 4)
Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj
	modules/ripple_app/ripple_app.cpp
2013-07-03 09:41:45 -07:00
Vinnie Falco
0ddd78e9b3 Update VS2012 Release build settings for VTune 2013-07-03 09:41:45 -07:00
Vinnie Falco
6c561fdf96 Update some beast container code 2013-07-03 09:41:44 -07:00
Vinnie Falco
f903df5a1a Fix out-of-date bug by recreating VS2012 project 2013-07-03 09:41:44 -07:00
Alex Dupre
cc651c15b5 Logging to debugger is useful only on Windows. 2013-07-03 09:41:44 -07:00
Alex Dupre
8d4d5038aa Linux implementation of isRunningUnderDebugger using ptrace() doesn't work on FreeBSD.
(I doubt it'll work on Linux, too, but I'm not sure)
2013-07-03 09:41:43 -07:00
Alex Dupre
bba1ab079e FreeBSD tuning. 2013-07-03 09:41:43 -07:00
JoelKatz
a732f397cb Limit transaction queue size. 2013-07-03 09:38:22 -07:00