From beb286321020aadde1c97889784665a12e230677 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 9 Jul 2015 08:32:41 -0400
Subject: [PATCH] Prepare 6.0.0 release

Update CHANGELOG, README and metadata.json to bump the module to the
first Kilo release (6.0.0).

Change-Id: I0efc9ea4a6bfcc03005abfe9f4b5eb948b31e089
---
 CHANGELOG.md  | 21 +++++++++++++++++++++
 README.md     |  2 +-
 metadata.json |  4 ++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df1c6c51..196a2328 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- Remove some old deprecated parameters
+
+####Features
+- Puppet 4.x support
+- Sort policy files in local_settings.py
+- Add support for Neutron DVR and L3 HA options
+- Collect static files before compressing them
+- Add support to add Tuskar-ui config to local_settings
+- Add support for WEBROOT in local_settings
+- Add 'log_handler' parameter
+
+####Maintenance
+- Acceptance tests with Beaker
+- Fix spec tests for RSpec 3.x and Puppet 4.x
+
 ##2015-06-17 - 5.1.0
 ###Summary
 
diff --git a/README.md b/README.md
index 0f775e35..caefbcbf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 horizon
 =======
 
-5.1.0 - 2014.2 - Juno
+6.0.0 - 2015.1 - Kilo
 
 #### Table of Contents
 
diff --git a/metadata.json b/metadata.json
index 1c580c18..5dddaea4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
-  "name": "stackforge-horizon",
-  "version": "5.1.0",
+  "name": "openstack-horizon",
+  "version": "6.0.0",
   "author": "Puppet Labs and OpenStack Contributors",
   "summary": "Puppet module for OpenStack Horizon",
   "license": "Apache-2.0",