diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-07 14:34:00 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-07 14:34:00 +0000 |
| commit | bacaa215eb2e1c11e50bbc3fb0e43e28a463458b (patch) | |
| tree | 27510a6358b8bc219ccd456622b963a3b394bee3 /synapse/util/logcontext.py | |
| parent | Merge branch 'hotfixes-v0.6.0a' (diff) | |
| parent | Improve change log (diff) | |
| download | synapse-bacaa215eb2e1c11e50bbc3fb0e43e28a463458b.tar.xz | |
Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse v0.6.1
Diffstat (limited to 'synapse/util/logcontext.py')
| -rw-r--r-- | synapse/util/logcontext.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py index 7d85018d97..da7872e95d 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py @@ -1,3 +1,17 @@ +# Copyright 2014, 2015 OpenMarket Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + import threading import logging |