update CHANGELOG 4.3.18

telsav · May 9, 2017 · e9e02a9 · e9e02a9
1 parent 50a4ea6
commit e9e02a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,6 +46,10 @@ matrix:
       sudo: false
       language: generic
       os: linux
+    - env: PYTHON_VERSION=3.6 CONDA_BUILD=3.0.0beta1
+      sudo: false
+      language: generic
+      os: linux
   allow_failures:
     - os: osx
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Improvements
 * resolve #4224 warn when pysocks isn't installed (#5226)
 * resolve #5229 add --insecure flag to skip ssl verification (#5230)
+* resolve #4151 add admin indicator to conda info on windows (#5241)
 
 ### Bug Fixes
 * fix #5152 conda info spacing (#5166)
@@ -18,9 +19,12 @@
 * fix #3470 extra newlines around exceptions (#5200)
 * fix #5214 install messages for 'nothing_to_do' case (#5216)
 * fix #598 stack trace for condarc write permission denied (#5232)
+* fix #4960 extra information when exception can't be displayed (#5236)
+* fix #4974 no matching dist in linked data for prefix (#5239)
 
 ### Non-User-Facing Changes
 * resolve #5138 add test of rm_rf of symlinked files (#4373)
+* resolve #4516 add extra trace-level logging (#5249, #5250)
 
 
 ## 4.3.17 (2017-04-24)