Merge pull request #425 from girder/update-change-log

Update the CHANGELOG with some recent PRs.

.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
-dist: xenial
+# dist: xenial
 language: python
 python:
   - "2.7"
@@ -12,18 +12,19 @@ services:
 addons:
   apt:
     packages:
-    - rabbitmq-server
+      - rabbitmq-server
 install:
   - pip install --upgrade pip
   - pip install --upgrade virtualenv
+  - if [ ${TRAVIS_PYTHON_VERSION:0:3} == "2.7" ]; then pip install virtualenv==20.0.5; fi
   - pip install tox-travis
   # If the last tag is more than 50 commits away, we need to fetch more for
   # the scm_version module to determine the version.
   - git fetch --depth=1000
 script:
   # Piping through cat does less buffering of the output but can consume the
   # exit code
-  - tox | cat; test ${PIPESTATUS[0]} -eq 0
+  - tox -s | cat; test ${PIPESTATUS[0]} -eq 0
 after_success:
   - pip install codecov
   - codecov --disable search pycov gcov --file build/test/coverage/py_coverage.xml build/test/coverage/cobertura-coverage.xml

CHANGELOG.md

@@ -8,6 +8,10 @@
 
 ### Bug Fixes
 - Fixed an issue where changing the annotation history setting when Girder's settings' cache was enable wouldn't take effect until after a restart (#422)
+- Fixed an issue when used as a Girder plugin and served with a proxy with a prefix path (#423)
+
+### Improvements
+- Better handling of imported file formats with adjacent files (#424)
 
 ## Version 1.0.2
 

large_image/config.py

@@ -4,8 +4,9 @@
 
 # Default logger
 fallbackLogger = logging.getLogger('large_image')
+fallbackLogger.setLevel(logging.INFO)
 fallbackLogHandler = logging.StreamHandler()
-fallbackLogHandler.setLevel(logging.INFO)
+fallbackLogHandler.setLevel(logging.NOTSET)
 fallbackLogger.addHandler(fallbackLogHandler)
 
 ConfigValues = {