
Hi Peter, I was not able to apply this patch: [alinefm@alinefm-TP440 wok]$ git am -3 ../mail-patches/\[PATCH\]\ \[Wok\]\ Adding\ typeahead\ library\ to\ wok.eml Applying: Adding typeahead library to wok fatal: corrupt patch at line 157 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Adding typeahead library to wok The copy of the patch that failed is found in: /home/alinefm/wok/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please, send an attached version for me. So I can grab it and apply. Usually it happens with large patch files that get corrupt when sending to the mailing list. Thanks, Aline Manera On 01/12/2016 02:39 PM, peterpnns@gmail.com wrote:
From: peterpennings <peterpnns@gmail.com>
This library is necessary to replace wok.comboBox() in iSCSI Server and target when defining a new storage pool and when loading sysmodules in Ginger. V2 = Fixed header message
peterpennings (1): Adding typeahead library to wok
configure.ac | 1 + ui/libs/Makefile.am | 2 +- ui/libs/typeahead/LICENSE | 19 +++++++++++++++++++ ui/libs/typeahead/Makefile.am | 20 ++++++++++++++++++++ ui/libs/typeahead/typeahead.bundle.min.js | 8 ++++++++ ui/pages/wok-ui.html.tmpl | 1 + 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 ui/libs/typeahead/LICENSE create mode 100644 ui/libs/typeahead/Makefile.am create mode 100644 ui/libs/typeahead/typeahead.bundle.min.js