From f96b479a0fc083ec09cf85a8b05509086c05cfe8 Mon Sep 17 00:00:00 2001
From: Christopher Armstrong <chris@chrisarmstrong.me>
Date: Sat, 4 Jan 2014 18:31:59 -0800
Subject: [PATCH] Prepare changelog for 1.17.4 release

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 094a3650..9ed296e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@ Java Cookbook CHANGELOG
 =======================
 This file is used to list changes made in each version of the Java cookbook.
 
+v1.17.4
+-------
+### Bug
+- **[#111](https://github.com/socrata-cookbooks/java/pull/111)** - Fix alternatives for centos
+
+### Improvement
+- **[COOK-4165](https://tickets.opscode.com/browse/COOK-4165)** Replace curl with remote_file with cookie header
+- **[#110](https://github.com/socrata-cookbooks/java/pull/110)** - Update openjdk to use the alternatives resource
+
 v1.17.2
 -------
 ### Bug