[Kimchi-devel] [PATCH] Configure nginx to proxy connections to the websocket server. This helps in networks with restrictive firewalls. - modify the nginx config file (kimchi.conf.in) and code to support changes - update README files - update firewalld config - m...

[Lemley, Rob]

Yeah that shouldn't be included. Sorry about that.

-Rob

--
Rob Lemley
System Administrator
Center for Integrated Research Computing
University of Rochester
rob.lemley at rochester.edu

-----Original Message-----
From: Aline Manera [mailto:alinefm at linux.vnet.ibm.com] 
Sent: Thursday, October 08, 2015 5:22 PM
To: Lemley, Rob; Kimchi Devel
Subject: Re: [PATCH] Configure nginx to proxy connections to the websocket server. This helps in networks with restrictive firewalls. - modify the nginx config file (kimchi.conf.in) and code to support changes - update README files - update firewalld config - m...


> --- a/src/wok/plugins/kimchi/ui/pages/storage.html.tmpl
> +++ b/src/wok/plugins/kimchi/ui/pages/storage.html.tmpl
> @@ -37,10 +37,7 @@
>   <div class="grid-control"><input type="text" class="filter" placeholder="$_("Filter")"></div>
>   <div id='storageGrid'>
>       <div>
> -        <span class="storage-name">
> -            <span>$_("Name")</span>
> -            <span class="usage">$_("%Used")</span>
> -        </span>
> +        <span class="storage-name">$_("Name")</span>
>           <span class="storage-state" >$_("State")</span>
>           <span class="storage-type">$_("Type")</span>
>           <span class="storage-capacity">$_("Capacity")</span>
>

I think those changes came from a conflict during rebase, right? May I 
dis consider them?