Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Leonardo Galli 2017-05-14 11:03:28 +02:00
commit 6210c5b8f8
2 changed files with 3 additions and 3 deletions

View File

@ -63,7 +63,7 @@ namespace NzbDrone.Common.Instrumentation
{
var target = new LogentriesTarget();
target.Name = "logentriesTarget";
target.Token = "d3a83ee9-74fb-4045-ad25-a84c1d4d7c81";
target.Token = "7688c9ac-015f-45c7-bfee-73f370f5f380";
target.LogHostname = true;
target.Debug = false;

View File

@ -134,9 +134,9 @@ namespace NzbDrone.Core.Jobs
{
var interval = _configService.RssSyncInterval;
if (interval > 0 && interval < 5)
if (interval > 0 && interval < 10)
{
return 5;
return 10;
}
if (interval < 0)