Merge branch '2.0' into 2.1

dpalominop · Feb 23, 2017 · a80bbe0 · a80bbe0
2 parents 863689c + bc86eee
commit a80bbe0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/paramiko/util.py b/paramiko/util.py
@@ -241,7 +241,7 @@ def log_to_file(filename, level=DEBUG):
     if len(l.handlers) > 0:
         return
     l.setLevel(level)
-    f = open(filename, 'w')
+    f = open(filename, 'a')
     lh = logging.StreamHandler(f)
     lh.setFormatter(logging.Formatter('%(levelname)-.3s [%(asctime)s.%(msecs)03d] thr=%(_threadid)-3d %(name)s: %(message)s',
                                       '%Y%m%d-%H:%M:%S'))

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :bug:`683` Make `util.log_to_file()` append instead of replace. Thanks
+  to ``@vlcinsky`` for the report.
 * :release:`2.1.2 <2017-02-20>`
 * :release:`2.0.5 <2017-02-20>`
 * :release:`1.18.2 <2017-02-20>`