Commit Graph

11 Commits

Author SHA1 Message Date
Matt Wells
5e4b5a112c Merge branch 'master' into diffbot
Conflicts:

	PageResults.cpp
	Threads.cpp
	XmlDoc.cpp
	XmlDoc.h
2013-12-07 11:34:26 -07:00
Matt Wells
d43b55103c show query in msg20 log msg 2013-12-01 12:11:25 -07:00
Matt Wells
1077191e4a fix log msg bug. 2013-12-01 12:08:05 -07:00
Matt Wells
d811a13627 fix small oopsy 2013-12-01 11:56:33 -07:00
Matt Wells
3155869fbf added new log msg for
recording cpu time for summary generation.
2013-12-01 11:53:41 -07:00
Matt Wells
43e40208b8 Merge branch 'master' into diffbot
Conflicts:
	SafeBuf.cpp
	SafeBuf.h
	SearchInput.cpp
	XmlDoc.cpp
2013-11-20 15:51:58 -08:00
mwells
5baf6a95d4 handle a bunch of oom conditions that
caused core. found using oom tester.
2013-11-20 10:14:02 -07:00
Matt Wells
25dd764dac Merge branch 'master' into diffbot
Conflicts:
	Makefile
	PageResults.cpp
2013-11-18 16:59:33 -08:00
Matt Wells
f85a953a34 fix core dump 2013-11-18 15:53:30 -07:00
Matt Wells
fe97e08281 move from groups to shards. got rid of annoying
groupid bit mask thing.
2013-10-04 16:18:56 -07:00
Matt Wells
f6e560c1f4 Initial file population. 2013-08-02 13:12:24 -07:00