From 8d36b83c50e02a5d8378f539db731c17fa3c0413 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 8 Jul 2015 19:20:32 -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: I3d9f8e0d6a697378bb8ef928e333c93c8ca0e422
---
 CHANGELOG.md  | 28 ++++++++++++++++++++++++++++
 README.md     |  2 +-
 metadata.json |  8 ++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e69f7f3..c3a1b33f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- Move rabbit/kombu settings to oslo_messaging_rabbit section
+- Remove sql_connection and sql_idle_timeout deprecated parameters
+- api: change default pipeline
+- Separate api and registry packages for Red Hat
+- python-ceph no longer exists in el7, use python-rbd
+
+####Features
+- Puppet 4.x support
+- Refactorise Keystone resources management
+- Migrate postgresql backend to use openstacklib::db::postgresql
+- Add support for identity_uri
+- Service Validation for Glance-API
+- Create a sync_db boolean for Glance
+- make service description configurable
+
+####Bugfixes
+- Fix API/Registry ensure for Ubuntu
+
+####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 a980477a..7d471435 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 glance
 =======
 
-5.1.0 - 2014.2 - Juno
+6.0.0 - 2015.1 - Kilo
 
 #### Table of Contents
 
diff --git a/metadata.json b/metadata.json
index 33e15564..c9c38624 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
-  "name": "stackforge-glance",
-  "version": "5.1.0",
+  "name": "openstack-glance",
+  "version": "6.0.0",
   "author": "Puppet Labs and OpenStack Contributors",
   "summary": "Puppet module for OpenStack Glance",
   "license": "Apache-2.0",
@@ -32,8 +32,8 @@
   "description": "Installs and configures OpenStack Glance (Image Service).",
   "dependencies": [
     { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
-    { "name": "stackforge/keystone", "version_requirement": ">=5.0.0 <6.0.0" },
+    { "name": "openstack/keystone", "version_requirement": ">=6.0.0 <7.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
-    { "name": "stackforge/openstacklib", "version_requirement": ">=5.0.0 <6.0.0" }
+    { "name": "openstack/openstacklib", "version_requirement": ">=6.0.0 <7.0.0" }
   ]
 }