update CHANGELOG 4.4.0

baszalmstra · Apr 25, 2017 · 2632139 · 2632139
1 parent ba75a87
commit 2632139
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -10,6 +10,7 @@ ignore:
   - conda_env/.*
   - conda/_vendor/.*
   - conda/console.py
+  - conda/cli/activate.py
   - conda/cli/main_package.py
   - conda/gateways/adapters/ftp.py
   - conda/gateways/adapters/s3.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### New Features
 * constrained, optional dependencies (#4982)
-* conda shell function (#5044)
+* conda shell function (#5044, #5141)
 
 ### Improvements
 * filter out unwritable package caches from conda clean command (#4620)

diff --git a/README.rst b/README.rst
@@ -7,17 +7,17 @@
 
 ----------------------------------------
 
-.. image:: https://img.shields.io/travis/conda/conda/4.3.x.svg?maxAge=900&label=Linux%20%26%20MacOS
+.. image:: https://img.shields.io/travis/conda/conda/4.4.x.svg?maxAge=900&label=Linux%20%26%20MacOS
     :target: https://travis-ci.org/conda/conda
     :alt: Linux & MacOS tests (Travis)
 
-.. image:: https://img.shields.io/appveyor/ci/ContinuumAnalyticsFOSS/conda/4.3.x.svg?maxAge=900&label=Windows
+.. image:: https://img.shields.io/appveyor/ci/ContinuumAnalyticsFOSS/conda/4.4.x.svg?maxAge=900&label=Windows
     :target: https://ci.appveyor.com/project/ContinuumAnalyticsFOSS/conda
     :alt: Windows tests (Appveyor)
 
-.. image:: https://img.shields.io/codecov/c/github/conda/conda/4.3.x.svg?label=coverage
+.. image:: https://img.shields.io/codecov/c/github/conda/conda/4.4.x.svg?label=coverage
    :alt: Codecov Status
-   :target: https://codecov.io/gh/conda/conda/branch/4.3.x
+   :target: https://codecov.io/gh/conda/conda/branch/4.4.x
 
 .. image:: https://img.shields.io/github/release/conda/conda.svg
    :alt: latest release version

diff --git a/setup.cfg b/setup.cfg
@@ -40,6 +40,7 @@ omit =
     *\site-packages\*
     conda/_vendor/*
     conda/console.py
+    conda/cli/activate.py
     conda/cli/main_package.py
     conda/gateways/adapters/ftp.py
     conda/gateways/adapters/s3.py