From fead3aab95d9597f1862c206c7c13a4861a2231c Mon Sep 17 00:00:00 2001
From: Hugh Saunders <hugh@wherenow.org>
Date: Mon, 20 Jan 2014 17:18:28 +0000
Subject: [PATCH] Remove Berksfile.lock from dev branches

blueprint remove-berksfile-lock-from-dev-branches

Change-Id: I730a7b8876a9610236f8afc5ef544abf2972dea2
---
 .gitignore     |  1 +
 Berksfile.lock | 51 --------------------------------------------------
 README.md      | 10 ++++++++++
 3 files changed, 11 insertions(+), 51 deletions(-)
 delete mode 100644 Berksfile.lock

diff --git a/.gitignore b/.gitignore
index e92db3f..3737739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .bundle/
 .cookbooks/
+Berksfile.lock
diff --git a/Berksfile.lock b/Berksfile.lock
deleted file mode 100644
index 5576836..0000000
--- a/Berksfile.lock
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "sources": {
-    "openstack-ops-messaging": {
-      "path": "."
-    },
-    "openstack-common": {
-      "locked_version": "8.0.0",
-      "git": "git://github.com/stackforge/cookbook-openstack-common.git",
-      "ref": "2201bd113ffe1742c19811aa4df59a5790af71e3"
-    },
-    "rabbitmq": {
-      "locked_version": "2.3.2"
-    },
-    "erlang": {
-      "locked_version": "1.4.2"
-    },
-    "apt": {
-      "locked_version": "2.3.4"
-    },
-    "yum": {
-      "locked_version": "3.0.2"
-    },
-    "yum-epel": {
-      "locked_version": "0.2.0"
-    },
-    "yum-erlang_solutions": {
-      "locked_version": "0.1.4"
-    },
-    "build-essential": {
-      "locked_version": "1.4.2"
-    },
-    "database": {
-      "locked_version": "1.6.0"
-    },
-    "mysql": {
-      "locked_version": "4.0.14"
-    },
-    "openssl": {
-      "locked_version": "1.1.0"
-    },
-    "postgresql": {
-      "locked_version": "3.3.4"
-    },
-    "aws": {
-      "locked_version": "1.0.0"
-    },
-    "xfs": {
-      "locked_version": "1.1.0"
-    }
-  }
-}
diff --git a/README.md b/README.md
index 0a39ed7..3a433b8 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,16 @@ Testing
 
 Please refer to the [TESTING.md](TESTING.md) for instructions for testing the cookbook.
 
+Berkshelf
+=====
+
+Berks will resolve version requirements and dependencies on first run and
+store these in Berksfile.lock. If new cookbooks become available you can run
+`berks update` to update the references in Berksfile.lock. Berksfile.lock will
+be included in stable branches to provide a known good set of dependencies.
+Berksfile.lock will not be included in development branches to encourage
+development against the latest cookbooks.
+
 License and Author
 ==================