From cc0e4ca64d4502ffedd92e0291c8376556eae57a Mon Sep 17 00:00:00 2001
From: Mark Doffman <mark.doffman@codethink.co.uk>
Date: Mon, 6 Oct 2014 14:23:45 -0500
Subject: Lorry more openstack dependencies.

Packages missing from initial openstack dependencies that were
needed upon testing.
---
 open-source-lorries/micheles.lorry         |  6 +++++
 open-source-lorries/openstack.lorry        |  5 ++++
 open-source-lorries/python-packages.lorry  | 40 ++++++++++++++++++++++++++++++
 open-source-lorries/rabbitmq-codegen.lorry |  6 +++++
 open-source-lorries/rabbitmq-server.lorry  |  6 +++++
 5 files changed, 63 insertions(+)
 create mode 100644 open-source-lorries/micheles.lorry
 create mode 100644 open-source-lorries/rabbitmq-codegen.lorry
 create mode 100644 open-source-lorries/rabbitmq-server.lorry

diff --git a/open-source-lorries/micheles.lorry b/open-source-lorries/micheles.lorry
new file mode 100644
index 0000000..bf2f6c9
--- /dev/null
+++ b/open-source-lorries/micheles.lorry
@@ -0,0 +1,6 @@
+{
+    "micheles": {
+        "type": "hg",
+        "url": "https://code.google.com/p/micheles/"
+    }
+}
diff --git a/open-source-lorries/openstack.lorry b/open-source-lorries/openstack.lorry
index bc8db40..c6e5ae2 100644
--- a/open-source-lorries/openstack.lorry
+++ b/open-source-lorries/openstack.lorry
@@ -199,6 +199,11 @@
         "url": "git://git.openstack.org/openstack/oslo.vmware.git"
     },
 
+    "openstack/oslo-utils": {
+        "type": "git",
+        "url": "git://git.openstack.org/openstack/oslo.utils.git"
+    },
+
     "openstack/pycadf": {
         "type": "git",
         "url": "git://git.openstack.org/openstack/pycadf.git"
diff --git a/open-source-lorries/python-packages.lorry b/open-source-lorries/python-packages.lorry
index 6299329..e4eb651 100644
--- a/open-source-lorries/python-packages.lorry
+++ b/open-source-lorries/python-packages.lorry
@@ -400,5 +400,45 @@
     "python-packages/zope-traversing": {
         "type": "git",
         "url": "git://github.com/zopefoundation/zope.traversing.git"
+    },
+    "python-packages/dogpile-core": {
+        "type": "git",
+        "url": "git@bitbucket.org:zzzeek/dogpile.core.git"
+    },
+    "python-packages/cryptography": {
+        "type": "git",
+        "url": "https://github.com/pyca/cryptography.git"
+    },
+    "python-packages/repose-lru": {
+        "type": "git",
+        "url": "git://github.com/repoze/repoze.lru.git"
+    },
+    "python-packages/ipaddr-py": {
+        "type": "git",
+        "url": "https://code.google.com/p/ipaddr-py/"
+    },
+    "python-packages/simplegeneric-tarball": {
+        "type": "tarball",
+        "url": "http://ftp.de.debian.org/debian/pool/main/s/simplegeneric/simplegeneric_0.8.1.orig.tar.bz2"
+    },
+    "python-packages/osprofiler": {
+        "type": "git",
+        "url": "git://github.com/stackforge/osprofiler.git"
+    },
+    "python-packages/retrying": {
+        "type": "git",
+        "url": "git://github.com/rholder/retrying.git"
+    },
+    "python-packages/sqalchemy-migrate": {
+        "type": "git",
+        "url": "git://github.com/stackforge/sqlalchemy-migrate.git"
+    },
+    "python-packages/json-patch": {
+        "type": "git",
+        "url": "git://github.com/stefankoegl/python-json-patch.git"
+    },
+    "python-packages/json-pointer": {
+        "type": "git",
+        "url": "git://github.com/stefankoegl/python-json-pointer.git"
     }
 }
diff --git a/open-source-lorries/rabbitmq-codegen.lorry b/open-source-lorries/rabbitmq-codegen.lorry
new file mode 100644
index 0000000..9a8644d
--- /dev/null
+++ b/open-source-lorries/rabbitmq-codegen.lorry
@@ -0,0 +1,6 @@
+{
+    "rabbitmq-codegen": {
+        "type": "hg",
+        "url": "http://hg.rabbitmq.com/rabbitmq-codegen"
+    }
+}
diff --git a/open-source-lorries/rabbitmq-server.lorry b/open-source-lorries/rabbitmq-server.lorry
new file mode 100644
index 0000000..831754b
--- /dev/null
+++ b/open-source-lorries/rabbitmq-server.lorry
@@ -0,0 +1,6 @@
+{
+    "rabbitmq-server": {
+        "type": "hg",
+        "url": "http://hg.rabbitmq.com/rabbitmq-server"
+    }
+}
-- 
cgit v1.2.1


From a08b1b0ae0dda21c291f96412da4c00e6c9db084 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Tue, 7 Oct 2014 11:20:59 +0100
Subject: Strip out duplicate lorries

---
 open-source-lorries/python-packages.lorry | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/open-source-lorries/python-packages.lorry b/open-source-lorries/python-packages.lorry
index e4eb651..2dec529 100644
--- a/open-source-lorries/python-packages.lorry
+++ b/open-source-lorries/python-packages.lorry
@@ -401,18 +401,10 @@
         "type": "git",
         "url": "git://github.com/zopefoundation/zope.traversing.git"
     },
-    "python-packages/dogpile-core": {
-        "type": "git",
-        "url": "git@bitbucket.org:zzzeek/dogpile.core.git"
-    },
     "python-packages/cryptography": {
         "type": "git",
         "url": "https://github.com/pyca/cryptography.git"
     },
-    "python-packages/repose-lru": {
-        "type": "git",
-        "url": "git://github.com/repoze/repoze.lru.git"
-    },
     "python-packages/ipaddr-py": {
         "type": "git",
         "url": "https://code.google.com/p/ipaddr-py/"
@@ -432,13 +424,5 @@
     "python-packages/sqalchemy-migrate": {
         "type": "git",
         "url": "git://github.com/stackforge/sqlalchemy-migrate.git"
-    },
-    "python-packages/json-patch": {
-        "type": "git",
-        "url": "git://github.com/stefankoegl/python-json-patch.git"
-    },
-    "python-packages/json-pointer": {
-        "type": "git",
-        "url": "git://github.com/stefankoegl/python-json-pointer.git"
     }
 }
-- 
cgit v1.2.1