From 19085a4ae4c38aadcb8beaf5974e66b052e3df1d Mon Sep 17 00:00:00 2001
From: Ryan Leckey <ryan@launchbadge.com>
Date: Thu, 22 Jun 2017 17:13:59 -0700
Subject: Update CHANGELOG.md

---
 CHANGELOG.md | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00d1108..88be8bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,15 +5,27 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 0.6.0 – Upcoming
- - Remove `namespace` option for File
- - Add builder pattern to condense configuration
+  - Implement `Source` for `Vec<T: Source>` and `Vec<Box<Source>>`
 
-   ```rust
-   Config::new()
-       .merge(File::with_name("Settings"))
-       .merge(Environment::with_prefix("APP"))
-       .unwrap()
-   ```
+    ```rust
+    Config::new()
+        .merge(vec![
+            File::with_name("config/default"),
+            File::with_name(&format!("config/{}", run_mode)),
+        ])
+    ```
+
+  - Implement `From<&Path>` and `From<PathBuf>` for `File`
+
+  - Remove `namespace` option for File
+  - Add builder pattern to condense configuration
+
+    ```rust
+    Config::new()
+        .merge(File::with_name("Settings"))
+        .merge(Environment::with_prefix("APP"))
+        .unwrap()
+    ```
 
 ## 0.5.2 – 2017-06-22
  - Parsing errors even for non required files – [@Anthony25] ( [#33] )
-- 
cgit v1.2.3