From 8946367a2d6a95d67473a8f2d43688cb51e2211e Mon Sep 17 00:00:00 2001
From: Jan Klare <j.klare@cloudbau.de>
Date: Tue, 31 May 2016 10:47:07 +0200
Subject: [PATCH] branching for stable/mitaka

Change-Id: Iad566dd9be7fb4cc7173f08ec6975da282c30284
---
 .gitignore     |  1 -
 .gitreview     |  1 +
 Berksfile      |  6 +++--
 Berksfile.lock | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 Berksfile.lock

diff --git a/.gitignore b/.gitignore
index d7ee44a..85227ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,5 @@ berks-cookbooks/
 .vagrant
 .coverage/
 *.swp
-Berksfile.lock
 Vagrantfile
 Gemfile.lock
diff --git a/.gitreview b/.gitreview
index a7d6598..65dae6f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-orchestration.git
+defaultbranch=stable/mitaka
diff --git a/Berksfile b/Berksfile
index b15f7b8..0b471b4 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,6 +3,8 @@ source "https://supermarket.chef.io"
 metadata
 
 cookbook "openstack-identity",
-  github: "openstack/cookbook-openstack-identity"
+  github: "openstack/cookbook-openstack-identity",
+  branch: "stable/mitaka"
 cookbook "openstack-common",
-  github: "openstack/cookbook-openstack-common"
+  github: "openstack/cookbook-openstack-common",
+  branch: "stable/mitaka"
diff --git a/Berksfile.lock b/Berksfile.lock
new file mode 100644
index 0000000..b3fdc20
--- /dev/null
+++ b/Berksfile.lock
@@ -0,0 +1,67 @@
+DEPENDENCIES
+  openstack-common
+    git: git://github.com/openstack/cookbook-openstack-common.git
+    revision: 1e86209d4e7cace92914ea3c0a15f225253d5da0
+    branch: stable/mitaka
+  openstack-identity
+    git: git://github.com/openstack/cookbook-openstack-identity.git
+    revision: 4fda2a0d5b7eee32c1b04e45d328f24a6940b7fc
+    branch: stable/mitaka
+  openstack-orchestration
+    path: .
+    metadata: true
+
+GRAPH
+  apache2 (3.2.2)
+  apt (2.9.2)
+  build-essential (4.0.0)
+    mingw (>= 0.0.0)
+    seven_zip (>= 0.0.0)
+  chef-sugar (3.3.0)
+  chef_handler (1.4.0)
+  compat_resource (12.10.4)
+  database (4.0.9)
+    postgresql (>= 1.0.0)
+  galera (0.4.1)
+  mariadb (0.3.1)
+    apt (>= 0.0.0)
+    yum (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  mingw (1.0.0)
+    compat_resource (>= 0.0.0)
+    seven_zip (>= 0.0.0)
+  mysql (6.0.31)
+    smf (>= 0.0.0)
+    yum-mysql-community (>= 0.0.0)
+  openssl (4.4.0)
+    chef-sugar (>= 3.1.1)
+  openstack-common (13.0.0)
+    apt (~> 2.8)
+    database (~> 4.0.2)
+    galera (~> 0.4.1)
+    mariadb (~> 0.3.1)
+    mysql (~> 6.0.13)
+    yum (~> 3.5.4)
+    yum-epel (~> 0.6.0)
+  openstack-identity (13.0.0)
+    apache2 (~> 3.1)
+    openstack-common (>= 13.0.0)
+  openstack-orchestration (13.0.0)
+    openstack-common (>= 13.0.0)
+    openstack-identity (>= 13.0.0)
+  postgresql (4.0.6)
+    apt (>= 1.9.0)
+    build-essential (>= 0.0.0)
+    openssl (~> 4.0)
+  rbac (1.0.3)
+  seven_zip (2.0.1)
+    windows (>= 1.2.2)
+  smf (2.2.8)
+    rbac (>= 1.0.1)
+  windows (1.42.0)
+    chef_handler (>= 0.0.0)
+  yum (3.5.4)
+  yum-epel (0.6.5)
+    yum (~> 3.2)
+  yum-mysql-community (0.2.0)
+    yum (>= 3.2)