From bc74ceb32231c1a1e3d25c277e98a33d04a2b606 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Wed, 28 Aug 2013 11:08:15 +0400 Subject: [PATCH] Resolve conflicts for OpenStack. --- profiles/hardened/linux/amd64/backbone/no-multilib/package.mask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/package.mask b/profiles/hardened/linux/amd64/backbone/no-multilib/package.mask index 3fb401dc..a0bc0755 100644 --- a/profiles/hardened/linux/amd64/backbone/no-multilib/package.mask +++ b/profiles/hardened/linux/amd64/backbone/no-multilib/package.mask @@ -9,5 +9,5 @@ =sys-kernel/hardened-sources-3.9.7 =sys-kernel/hardened-sources-3.10.4 =sys-kernel/hardened-sources-3.10.4-r1 -=dev-python/cliff-1.4 # resolve conflicts for OpenStack =dev-python/python-quantumclient-2.2.6 # resolve conflicts for OpenStack +=dev-python/python-quantumclient-2.2.3 # resolve conflicts for OpenStack