diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-04-14 20:42:34 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-04-14 20:42:34 -0700 |
| commit | 82ca771cb9981a549ef9f5a72161b823babdfb0d (patch) | |
| tree | 5f016e0bd77d38220bd5e0817c6590945a51e71b /MediaBrowser.Server.Implementations/Providers | |
| parent | 8c0718b5ee91fd21e74339cc7cb20332f6f08195 (diff) | |
| parent | 6138a7540bc25d6c1173bcd0f9fd2826ab84462a (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations/Providers')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Providers/ProviderManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs index ff7222e7c1..58bb232a25 100644 --- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs +++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs @@ -237,7 +237,7 @@ namespace MediaBrowser.Server.Implementations.Providers } catch (OperationCanceledException ex) { - _logger.Debug("{0} cancelled for {1}", provider.GetType().Name, item.Name); + _logger.Debug("{0} canceled for {1}", provider.GetType().Name, item.Name); // If the outer cancellation token is the one that caused the cancellation, throw it if (cancellationToken.IsCancellationRequested && ex.CancellationToken == cancellationToken) |