Merge pull request #72 from DataDog/leo/12changelog
Prepare 1.2.0 release
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34c1e69..489d494 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,24 @@
Changes
=======
+# 1.2.0 / 2015-02-24
+
+### Notes
+
+* [FEATURE] Add zookeeper integration
+* [FEATURE] Make redhat/yum base URL configurable
+* [FEATURE] Add docker integration
+* [FEATURE] Add postgres integration
+* [FEATURE] Add `use_mount` option in the base datadog_agent class
+* [FEATURE] Add proxy options in the base datadog_agent class
+* [BUGFIX] Use correct JMX-styled tags in JMX integrations
+> Careful this means that you probably have to update a buggy array of tags (that gives you nothing in the agent) to a hash of tags.
+
+* [BUGFIX] Fix ordering in YAML templates using `to_yaml` broken because of ruby 1.8
+* [CI] Add boilerpate for specs and linting rake tasks
+* [CI] Add a travis build!
+* [CI] All base manifests should have specs
+
# 1.1.1 / 2014-10-03
### Notes
diff --git a/metadata.json b/metadata.json
index dfa466f..ae546a2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
{
"name": "datadog-datadog_agent",
- "version": "1.1.1",
+ "version": "1.2.0",
"author": "James Turnbull (<james@lovedthanlost.net>) and Rob Terhaar (<rob@atlanticdynamic>) for Datadog Inc.",
"summary": "Install the Datadog monitoring agent and report Puppet runs to Datadog",
"license": "Apache License, Version 2.0",
