From f49942510cee377da14608a3fd276cd1dce86404 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 6 Oct 2013 11:32:24 -0400
Subject: [PATCH] Version bump to v1.2.0

---
 CHANGELOG.md | 11 +++++++++++
 metadata.rb  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aec7148d5..64c9104ac4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@ jenkins Cookbook CHANGELOG
 ==========================
 This file is used to list changes made in each version of the jenkins cookbook.
 
+v1.2.0
+------
+### Improvement
+- **[COOK-3710](https://tickets.opscode.com/browse/COOK-3710)** - Allow winsw url to be changed with a node attribute
+
+### Bug
+- **[COOK-3709](https://tickets.opscode.com/browse/COOK-3709)** - Use correct attribute value for `java_home`
+- **[COOK-3701](https://tickets.opscode.com/browse/COOK-3701)** - Fix a refactor bug where a template variable was removed that was used in a nested template
+- **[COOK-3594](https://tickets.opscode.com/browse/COOK-3594)** - Fix MiniTest Chef Handler tests for directory permissions
+
+
 v1.1.0
 ------
 ### Bug
diff --git a/metadata.rb b/metadata.rb
index 372e1203f2..4b8671c369 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs and configures Jenkins CI server & slaves'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.1'
+version          '1.2.0'
 
 recipe 'default', 'Does nothing'
 recipe 'iptables', 'Configures iptables to allow incoming connections to the jenkins instance'