<html>
  <head>
    <meta content="text/html; charset=ISO-8859-1"
      http-equiv="Content-Type">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    <div class="moz-cite-prefix">Hi Chen,<br>
      <br>
      I have raised the patch
      <meta http-equiv="content-type" content="text/html;
        charset=ISO-8859-1">
      <a href="http://gerrit.ovirt.org/#/c/16364/">http://gerrit.ovirt.org/#/c/16364/</a>
      to correct the same.<br>
      <br>
      Thanks and Regards,<br>
      Shubhendu Tripathi<br>
      <br>
      On 07/03/2013 08:31 AM, Chen, Wei D wrote:<br>
    </div>
    <blockquote
cite="mid:C5A0092C63E939488005F15F736A81120A5DC020@SHSMSX103.ccr.corp.intel.com"
      type="cite">
      <pre wrap="">Found confliction in LocalizedEnums.properties, someone may want to take
care of it.

code path:
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/ui
compat/LocalizedEnums.properties

292 &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
293 VdcActionType___RefreshGlusterHook=Refresh Gluster Hook
294 =======
295 VdcActionType___ManageGlusterService=Manage Service
296 &gt;&gt;&gt;&gt;&gt;&gt;&gt; gluster: bll command to start/stop/restart service

Best Regards,
Dave Chen

</pre>
      <br>
      <fieldset class="mimeAttachmentHeader"></fieldset>
      <br>
      <pre wrap="">_______________________________________________
Engine-devel mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Engine-devel@ovirt.org">Engine-devel@ovirt.org</a>
<a class="moz-txt-link-freetext" href="http://lists.ovirt.org/mailman/listinfo/engine-devel">http://lists.ovirt.org/mailman/listinfo/engine-devel</a>
</pre>
    </blockquote>
    <br>
  </body>
</html>