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:
From: samhenri <samuel.guimaraes(a)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