kolan
/
Overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve conflicts for OpenStack.

This commit is contained in:
Kolan Sh 2013-08-28 11:08:15 +04:00
parent cfa8322e6e
commit bc74ceb322
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
profiles/hardened/linux/amd64/backbone/no-multilib/package.mask
View File

@ -9,5 +9,5 @@
=sys-kernel/hardened-sources-3.9.7 =sys-kernel/hardened-sources-3.9.7
=sys-kernel/hardened-sources-3.10.4 =sys-kernel/hardened-sources-3.10.4
=sys-kernel/hardened-sources-3.10.4-r1 =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.6 # resolve conflicts for OpenStack
=dev-python/python-quantumclient-2.2.3 # resolve conflicts for OpenStack