summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Davis <nitzmahone@users.noreply.github.com>2018-02-08 16:34:18 -0800
committerMatt Davis <mrd@redhat.com>2018-02-08 17:06:52 -0800
commit1f49fa2129ef0359b66f4484e7d31a92580d0cfe (patch)
tree2c4787bb626042ea111b29df428585c40056ca74
parentc1c5433733d93e301be2622c7f35664f7fa49752 (diff)
downloadansible-1f49fa2129ef0359b66f4484e7d31a92580d0cfe.tar.gz
stub 2.6 in devel CHANGELOG, update 2.5 info
-rw-r--r--CHANGELOG.md25
1 files changed, 20 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48c407e99e..c58f37eb70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,24 @@
Ansible Changes By Release
==========================
+<a id="2.6"></a>
+
+## 2.5 "Heartbreaker" - ACTIVE DEVELOPMENT
+
+### Major Changes
+
+### Deprecations (to be removed in 2.10)
+
+### Minor Changes
+
+#### Removed modules (previously deprecated)
+
+### New Modules
+
+
<a id="2.5"></a>
-## 2.5 "TBD" - ACTIVE DEVELOPMENT
+## 2.5 "Kashmir" - March 2018 (estimated)
[Porting Guide](http://docs.ansible.com/ansible/devel/porting_guides.html)
@@ -78,7 +93,7 @@ See [Porting Guide](http://docs.ansible.com/ansible/devel/porting_guides.html) f
### New Plugins
-## Lookups
+#### Lookups
* aws_ssm: Query AWS ssm data
* aws_account_attribute: Query AWS account attributes such as EC2-Classic
availability
@@ -86,16 +101,16 @@ See [Porting Guide](http://docs.ansible.com/ansible/devel/porting_guides.html) f
* openshift: Return info from Openshift installation
* redis: look up date from Redis DB, deprecates the redis_kv one.
-## Callbacks
+#### Callbacks
* yaml
-## Connections
+#### Connections
* network_cli
* netconf
While neither is technically a new plugin, these connections may now be used directly with network modules. See [Network Best Practices for Ansible 2.5](http://docs.ansible.com/ansible/devel/network_best_practices_2.5.html) for more details.
-## Filters
+#### Filters
* parse_xml
### New Modules