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

[Aline Manera]

On 09/10/2015 10:15, Samuel Henrique De Oliveira Guimaraes wrote:
> 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.

I've already applied some patches from the 6/6 patch set. So, please, 
rebase your V2 on master, so we wil have only the diff we need to merge 
upstream.

> Samuel



> -----Original Message-----
> From: kimchi-devel-bounces at ovirt.org [mailto:kimchi-devel-bounces at ovirt.org] On Behalf Of Aline Manera
> Sent: quinta-feira, 8 de outubro de 2015 18:57
> To: sguimaraes943 at gmail.com; Kimchi Devel <kimchi-devel at ovirt.org>
> 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 at 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 at gmail.com wrote:
>> From: samhenri <samuel.guimaraes at eldorado.org.br>
>>
>> This patch fixes debug reports that weren't showing in Kimchi Hosts. It also orders Disk I/O and Network I/O dashboards series so we can see all the polylines (stripped vertical line pattern is only created for the first series in the charts).
>> This patch also includes the images for the storage pools that will be updated with the new-ui in the next patch.
>>
>> Regards,
>> Samuel
>>
>> samhenri (1):
>>     Fixed kimchi.hosts.js dashboard graphs and added Storage pool
>> images
>>
>>    src/wok/plugins/kimchi/ui/js/src/kimchi.host.js | 518 ++++++++++++------------
>>    ui/images/theme-default/high.png                | Bin 0 -> 812 bytes
>>    ui/images/theme-default/low.png                 | Bin 0 -> 813 bytes
>>    ui/images/theme-default/med.png                 | Bin 0 -> 873 bytes
>>    4 files changed, 250 insertions(+), 268 deletions(-)
>>    create mode 100644 ui/images/theme-default/high.png
>>    create mode 100644 ui/images/theme-default/low.png
>>    create mode 100644 ui/images/theme-default/med.png
>>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>