Re: [Kimchi-devel] [PATCH 0/1] Fixed kimchi.hosts.js dashboard for the new-ui

Yes, it depends on the previous batch of patches related to the new-ui. I'll send a v2 merged with patch 6/6 and keep the Storage Pools images with Storages updated with the new-ui. Samuel -----Original Message----- From: kimchi-devel-bounces(a)ovirt.org [mailto:kimchi-devel-bounces@ovirt.org] On Behalf Of Aline Manera Sent: quinta-feira, 8 de outubro de 2015 18:57 To: sguimaraes943(a)gmail.com; Kimchi Devel <kimchi-devel(a)ovirt.org&gt; Subject: Re: [Kimchi-devel] [PATCH 0/1] Fixed kimchi.hosts.js dashboard for the new-ui Hi Samuel, Does this patch depends on another one? I got the following error while trying to apply it: alinefm@alinefm-ThinkPad-T440:~/kimchi$ git am -3 ../mail-patches/\[PATCH\ 1_1\]\ Fixed\ kimchi.hosts.js\ dashboard\ graphs\ and\ added\ Storage\ pool\ images.lml Applying: Fixed kimchi.hosts.js dashboard graphs and added Storage pool images fatal: sha1 information is lacking or useless (src/wok/plugins/kimchi/ui/js/src/kimchi.host.js). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Fixed kimchi.hosts.js dashboard graphs and added Storage pool images The copy of the patch that failed is found in: /home/alinefm/kimchi/.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". On 07/10/2015 16:55, sguimaraes943(a)gmail.com wrote: _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel