allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/3] git commit: [#4657] update for solr changes
Date Tue, 02 Jul 2013 19:44:33 GMT
Updated Branches:
  refs/heads/db/4657 [created] d9b5b87e4


[#4657] update for solr changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ea385820
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ea385820
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ea385820

Branch: refs/heads/db/4657
Commit: ea385820156ba664ecc3b8f0ca8260e23b59acaa
Parents: b3f80f6
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Mon Jun 10 19:46:03 2013 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Tue Jul 2 19:44:19 2013 +0000

----------------------------------------------------------------------
 Allura/allura/lib/app_globals.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ea385820/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 62b1b3a..ba00f3f 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -115,7 +115,7 @@ class Globals(object):
         if asbool(config.get('solr.mail.mock')):
             self.solr_mail = MockSOLR()
         elif self.solr_mail_server:
-            self.solr_mail = Solr(self.solr_mail_server, timeout=int(config.get('solr.mail.timeout',
60)))
+            self.solr_mail = make_solr_from_config(self.solr_mail_server, timeout=int(config.get('solr.mail.timeout',
60)))
         self.use_queue = asbool(config.get('use_queue', False))
 
         # Load login/logout urls; only used for SFX logins


Mime
View raw message