Resolve conflicts for OpenStack.

2013-08-17 15:53:41 +04:00 · 2013-08-17 15:53:41 +04:00 · 0e0738f32b
parent 0668d90f5f
commit 0e0738f32b
1 changed files with 2 additions and 0 deletions
--- a/profiles/hardened/linux/amd64/backbone/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/backbone/no-multilib/package.mask
@ -9,3 +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