Author: ssmiweve Date: 2008-04-10 11:21:04 +0200 (Thu, 10 Apr 2008) New Revision: 6392
Modified: branches/2.17/ branches/2.17/generic.sesam/pom.xml branches/2.17/pom.xml Log: Merged revisions 6338-6391 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.16 ........ r6344 | ssmiweve | 2008-04-03 21:44:11 +0200 (Thu, 03 Apr 2008) | 2 lines http://sesat.no/svn/sesat-kernel ........ r6378 | ssmiweve | 2008-04-07 12:14:14 +0200 (Mon, 07 Apr 2008) | 2 lines mojo: jump forward a version to reap some bugfixes ........ r6391 | ssmiweve | 2008-04-10 10:47:58 +0200 (Thu, 10 Apr 2008) | 1 line OPS-178 Prepare Gamma for secondary production use ........ Property changes on: branches/2.17 ___________________________________________________________________ Name: svnmerge-integrated - /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6337 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 + /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6391 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 Modified: branches/2.17/generic.sesam/pom.xml =================================================================== --- branches/2.17/generic.sesam/pom.xml 2008-04-10 08:47:58 UTC (rev 6391) +++ branches/2.17/generic.sesam/pom.xml 2008-04-10 09:21:04 UTC (rev 6392) @@ -379,7 +379,7 @@ <build><pluginManagement /></build> <properties> - <sesam.site>generic.gamma.test.sesam.no</sesam.site> + <sesam.site>generic.sesam.no</sesam.site> <!-- QR Servers --> <newsQueryServerURL>http://10.16.195.250:15100</newsQueryServerURL> Modified: branches/2.17/pom.xml =================================================================== --- branches/2.17/pom.xml 2008-04-10 08:47:58 UTC (rev 6391) +++ branches/2.17/pom.xml 2008-04-10 09:21:04 UTC (rev 6392) @@ -323,8 +323,10 @@ <id>gamma</id> <activation /> <properties> - <sesam.site.generic>generic.gamma.test.sesam.no</sesam.site.generic> + <sesam.site.generic>generic.sesam.no</sesam.site.generic> <sesam.site.default>${sesam.site.generic}</sesam.site.default> + <!-- IMPORTANT: production cannot handle writing to sesam.log at a lower threshold --> + <log.level>WARN</log.level> <serverDeployLocation>scpexe://sch-login01.osl.basefarm.net/www/schibstedsok-prod/gamma.test.sesam.no</serverDeployLocation> </properties> <build> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
