Merge branch 'diffbot-testing' of github.com:gigablast/open-source-search-engine into diffbot-testing

This commit is contained in:
Matt Wells 2014-05-16 09:38:42 -07:00
commit eea5dff0f5
3 changed files with 5 additions and 3 deletions

View File

@ -40,7 +40,7 @@ void Msg39::reset() {
m_numDocIdSplits = 1;
m_tmpq.reset();
m_numTotalHits = 0;
m_gotClusterRecs = 0;
reset2();
}

View File

@ -10083,7 +10083,9 @@ void Parms::init ( ) {
"attempts to spider. Search for them using special "
"query operators like type:status or gberrorstr:success or "
"stats:gberrornum to get a histogram. They will not otherwise "
"show up in the search results.";
"show up in the search results. This will not work for "
"diffbot crawlbot collections yet until it has proven "
"more stable.";
m->m_cgi = "isr";
m->m_off = (char *)&cr.m_indexSpiderReplies - x;
m->m_type = TYPE_BOOL;

View File

@ -151,7 +151,7 @@
# Then run <i>/etc/init.d/sendmail restart</i> as root to pick up those
# changes so sendmail will forward Gigablast's mail to the address you give
# below.
<emailServer1><![CDATA[10.5.54.47]]></>
<emailServer1><![CDATA[127.0.0.1]]></>
# Sends to this address when sending email 1
<emailAddress1><![CDATA[4081234567@vtext.com]]></>