-From 632186c1a4e3d971bab1d017ea3289e92c85d86c Mon Sep 17 00:00:00 2001
+From 2cd2b4092d529eebc2485567c92622fe3b055faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Wed, 24 Oct 2012 13:44:37 +0100
Subject: [PATCH] Use updated parallel install versions of epel package
Conflicts:
bin/cinder-manage
---
- bin/cinder-manage | 7 ++++---
- cinder/__init__.py | 30 ++++++++++++++++++++++++++++++
- cinder/db/sqlalchemy/migration.py | 7 ++++++-
+ bin/cinder-manage | 7 ++++---
+ cinder/__init__.py | 30 ++++++++++++++++++++++++++++++
+ cinder/db/sqlalchemy/migration.py | 7 ++++++-
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/bin/cinder-manage b/bin/cinder-manage