From 96dee96fe644f64f574247ffc4ae6fa245632527 Mon Sep 17 00:00:00 2001
From: Cody Herriges <c.a.herriges@gmail.com>
Date: Mon, 24 Jun 2013 21:31:20 -0700
Subject: [PATCH] Puppet Forge release 2.0.0

  Marks the commit that the branch stable/grizzly and the 2.0.0 tag is
  cut from, adds the pkg directory to .gitignore to prevent accidental
  committing of Forge artifacts to the repository, updates release notes
  seciton of the README.

Change-Id: Icca41d9448833de35776395eaf2ab6c50a717956
---
 .gitignore | 1 +
 README.md  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8ffb147..ac4ce28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ spec/fixtures/manifests/*
 *swp
 .vendor
 Gemfile.lock
+pkg
diff --git a/README.md b/README.md
index 42b6aa4..e0d6c92 100644
--- a/README.md
+++ b/README.md
@@ -482,6 +482,8 @@ Release Notes
 * Refactor of glance and cinder related classes.
 * Nova-conductor added.
 * Various cleanups and bug fixes.
+* Removes Puppet 3.2 deprecation warnings in templates.
 * Adds the option to automatically set up RedHat or Ubuntu supplemental repositories.
 * Class['openstack::all'] refactor that adds support of future compute nodes to be added.
 * The cinder-volume logical volume group is no longer a requirement.
+* Swift can use the disk storage_type