[python-virtinst/f17: 4/4] Merge branch 'f18' into f17
Cole Robinson
crobinso at fedoraproject.org
Wed Oct 24 00:46:42 UTC 2012
commit 764d202713ee6e11b4f5cf9494d4b601141b02d1
Merge: 1555ac7 3d7ff24
Author: Cole Robinson <crobinso at redhat.com>
Date: Tue Oct 23 19:42:53 2012 -0400
Merge branch 'f18' into f17
Conflicts:
python-virtinst.spec
...sk-Ignore-path-None-for-permissions-check.patch | 29 ++++++
...eter-passed-from-StorageVolume.find_free_.patch | 97 ++++++++++++++++++++
0003-osdict-Add-Fedora-18.patch | 37 ++++++++
0004-virt-install-Fix-disk-.sparse.patch | 28 ++++++
python-virtinst.spec | 20 ++++-
5 files changed, 210 insertions(+), 1 deletions(-)
---
More information about the scm-commits
mailing list