On 04/22/2014 06:29 AM, Hongliang Wang wrote:
git am failed.
Applying: Fix select menu data append error: patch failed: ui/js/widgets/select-menu.js:38 error: ui/js/widgets/select-menu.js: patch does not apply Patch failed at 0001 Fix select menu data append
Hi Hongliang, I would apply this patch over master branch without problems. You can try to use "git am -3"
On 04/22/2014 05:05 PM, lvroyce@linux.vnet.ibm.com wrote:
From: Royce Lv <lvroyce@linux.vnet.ibm.com>
This patchset fix bug relating to select menu, Add guest disk attach/detach ui support, choose reasonable bus as default for disk/cdrom, refresh the disk display view.
Royce Lv (3): Fix select menu data append UI: Support add guest disk Display all disk types in storage edit view
ui/css/theme-default/guest-storage-add.css | 16 +++++ ui/js/src/kimchi.guest_edit_main.js | 5 +- ui/js/src/kimchi.guest_storage_add.main.js | 110 +++++++++++++++++++++++++++-- ui/js/widgets/select-menu.js | 3 +- ui/pages/guest-edit.html.tmpl | 17 ++++- ui/pages/guest-storage-add.html.tmpl | 50 ++++++++++++- 6 files changed, 188 insertions(+), 13 deletions(-)
_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel