Merge pull request #177 from matthiasbeyer/prepare-0.110.11.0

Version 0.11.0

3 files changed, 16 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7171e72..05bfeca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.11.0 - 2021-03-17
+ - The `Config` type got a builder-pattern `with_merged()` method [#166].
+ - A `Config::set_once()` function was added, to set an value that can be
+   overwritten by `Config::merge`ing another configuration [#172]
+ - serde_hjson is, if enabled, pulled in without default features.
+   This is due to a bug in serde_hjson, see [#169] for more information.
+ - Testing is done on github actions [#175]
+
+[#166]: https://github.com/mehcode/config-rs/pull/166
+[#172]: https://github.com/mehcode/config-rs/pull/172
+[#169]: https://github.com/mehcode/config-rs/pull/169
+[#175]: https://github.com/mehcode/config-rs/pull/169
+
 ## 0.10.1 - 2019-12-07
  - Allow enums as configuration keys [#119]
 
diff --git a/Cargo.toml b/Cargo.toml
index f0f75b6..ae6e770 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "config"
-version = "0.10.1"
+version = "0.11.0"
 description = "Layered configuration system for Rust applications."
 homepage = "https://github.com/mehcode/config-rs"
 repository = "https://github.com/mehcode/config-rs"
@@ -11,7 +11,7 @@ categories = ["config"]
 license = "MIT/Apache-2.0"
 
 [badges]
-travis-ci = { repository = "mehcode/config-rs" }
+maintenance = { status = "actively-developed" }
 
 [features]
 default = ["toml", "json", "yaml", "hjson", "ini"]
diff --git a/README.md b/README.md
index 0025e5d..243b42c 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 
 ```toml
 [dependencies]
-config = "0.10"
+config = "0.11"
 ```
 
  - `ini` - Adds support for reading INI files