http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-tree.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-tree.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-tree.html
index 18ba77b..43ea8ef 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-tree.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-tree.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -133,3 +134,136 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>org.trafodion.dcs.version.util 类分层结构 (Trafodion Database 
Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="org.trafodion.dcs.version.util 
\u7C7B\u5206\u5C42\u7ED3\u6784 (Trafodion Database Connectivity Services 2.3.0 
API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>ç±»</li>
+<li>使用</li>
+<li class="navBarCell1Rev">树</li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a 
href="../../../../../org/trafodion/dcs/util/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/zookeeper/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/package-tree.html"
 target="_top">框架</a></li>
+<li><a href="package-tree.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">程序包org.trafodion.dcs.version.util的分层结构</h1>
+<span class="strong">程序包分层结构:</span>
+<ul class="horizontal">
+<li><a href="../../../../../overview-tree.html">所有程序包</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="类分层结构">类分层结构</h2>
+<ul>
+<li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口"><span class="strong">Object</span></a>
+<ul>
+<li type="circle">org.trafodion.dcs.version.util.<a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.html" 
title="org.trafodion.dcs.version.util中的类"><span 
class="strong">VerGen</span></a></li>
+<li type="circle">org.trafodion.dcs.version.util.<a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类"><span 
class="strong">VerGen.Version</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>ç±»</li>
+<li>使用</li>
+<li class="navBarCell1Rev">树</li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a 
href="../../../../../org/trafodion/dcs/util/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/zookeeper/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/package-tree.html"
 target="_top">框架</a></li>
+<li><a href="package-tree.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-use.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-use.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-use.html
index 64a488d..7cebad1 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-use.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-use.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -152,3 +153,155 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>程序包 org.trafodion.dcs.version.util的使用 (Trafodion Database 
Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="\u7A0B\u5E8F\u5305 
org.trafodion.dcs.version.util\u7684\u4F7F\u7528 (Trafodion Database 
Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>ç±»</li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/package-use.html"
 target="_top">框架</a></li>
+<li><a href="package-use.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="程序包 org.trafodion.dcs.version.util 的使用" 
class="title">程序包 org.trafodion.dcs.version.util<br>的使用</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表程序包和解释">
+<caption><span>使用<a 
href="../../../../../org/trafodion/dcs/version/util/package-summary.html">org.trafodion.dcs.version.util</a>的程序åŒ
…</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">程序包</th>
+<th class="colLast" scope="col">说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.version.util">org.trafodion.dcs.version.util</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.version.util">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span><a 
href="../../../../../org/trafodion/dcs/version/util/package-summary.html">org.trafodion.dcs.version.util</a>使用的<a
 
href="../../../../../org/trafodion/dcs/version/util/package-summary.html">org.trafodion.dcs.version.util</a>中的类</span><span
 class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">类和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/trafodion/dcs/version/util/class-use/VerGen.Version.html#org.trafodion.dcs.version.util">VerGen.Version</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li>ç±»</li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/package-use.html"
 target="_top">框架</a></li>
+<li><a href="package-use.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/DcsQuorumPeer.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/DcsQuorumPeer.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/DcsQuorumPeer.html
index a4e589e..4e70282 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/DcsQuorumPeer.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/DcsQuorumPeer.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -103,6 +104,109 @@
 <br>
 <pre>public class <span class="strong">DcsQuorumPeer</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DcsQuorumPeer (Trafodion Database Connectivity Services 2.3.0 
API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="DcsQuorumPeer (Trafodion Database Connectivity 
Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/DcsQuorumPeer.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个类</li>
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/zookeeper/DcsQuorumPeer.html" 
target="_top">框架</a></li>
+<li><a href="DcsQuorumPeer.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.zookeeper</div>
+<h2 title="ç±» DcsQuorumPeer" class="title">ç±» DcsQuorumPeer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.zookeeper.DcsQuorumPeer</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">DcsQuorumPeer</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">DCS's version of ZooKeeper's QuorumPeer. When DCS is set to 
manage
  ZooKeeper, this class is used to start up QuorumPeer instances. By doing
  things in here rather than directly calling to ZooKeeper, we have more

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKConfig.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKConfig.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKConfig.html
index 5b30c1b..211fb9d 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKConfig.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKConfig.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -148,6 +149,154 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html#getZKQuorumServersString(java.util.Properties)">getZKQuorumServersString</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html?is-external=true";
 title="class or interface in java.util">Properties</a>&nbsp;properties)</code>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ZKConfig (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ZKConfig (Trafodion Database Connectivity 
Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/ZKConfig.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/zookeeper/ZKConfig.html" 
target="_top">框架</a></li>
+<li><a href="ZKConfig.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.zookeeper</div>
+<h2 title="ç±» ZKConfig" class="title">ç±» ZKConfig</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.zookeeper.ZKConfig</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ZKConfig</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+<div class="block">Utility methods for reading, parsing, and building 
zookeeper configuration.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html#ZKConfig()">ZKConfig</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html#getZKQuorumServersString(org.apache.hadoop.conf.Configuration)">getZKQuorumServersString</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>
+<div class="block">Return the ZK Quorum servers string given the specified 
configuration.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html#getZKQuorumServersString(java.util.Properties)">getZKQuorumServersString</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html?is-external=true";
 title="java.util中的类或接口">Properties</a>&nbsp;properties)</code>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Return the ZK Quorum servers string given zk properties 
returned by
  makeZKProps</div>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKServerTool.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKServerTool.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKServerTool.html
index 390610f..e78beba 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKServerTool.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZKServerTool.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -103,6 +104,109 @@
 <br>
 <pre>public class <span class="strong">ZKServerTool</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ZKServerTool (Trafodion Database Connectivity Services 2.3.0 
API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ZKServerTool (Trafodion Database Connectivity 
Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/ZKServerTool.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZkUtil.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/zookeeper/ZKServerTool.html" 
target="_top">框架</a></li>
+<li><a href="ZKServerTool.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.zookeeper</div>
+<h2 title="ç±» ZKServerTool" class="title">ç±» ZKServerTool</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.zookeeper.ZKServerTool</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ZKServerTool</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Tool for reading ZooKeeper servers from dcs XML 
configuration and producing
  a line-by-line list for use by bash scripts.</div>
 </li>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkClient.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkClient.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkClient.html
index 495a152..1f5e46e 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkClient.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkClient.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -181,6 +182,187 @@ implements org.apache.zookeeper.Watcher</pre>
       byte[]&nbsp;data,
       <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.zookeeper.data.ACL&gt;&nbsp;acl,
       org.apache.zookeeper.CreateMode&nbsp;createMode)</code>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ZkClient (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ZkClient (Trafodion Database Connectivity 
Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/ZkClient.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/zookeeper/DcsQuorumPeer.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/zookeeper/ZkClient.html" 
target="_top">框架</a></li>
+<li><a href="ZkClient.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.zookeeper</div>
+<h2 title="ç±» ZkClient" class="title">ç±» ZkClient</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.zookeeper.ZkClient</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd>org.apache.zookeeper.Watcher</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="strong">ZkClient</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a>
+implements org.apache.zookeeper.Watcher</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested_class_summary">
+<!--   -->
+</a>
+<h3>嵌套类概要</h3>
+<ul class="blockList">
+<li class="blockList"><a 
name="nested_classes_inherited_from_class_org.apache.zookeeper.Watcher">
+<!--   -->
+</a>
+<h3>从接口继承的嵌套类/接口&nbsp;org.apache.zookeeper.Watcher</h3>
+<code>org.apache.zookeeper.Watcher.Event</code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html#ZkClient()">ZkClient</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html#ZkClient(int,%20int,%20int)">ZkClient</a></strong>(int&nbsp;sessionTimeout,
+        int&nbsp;maxRetries,
+        int&nbsp;retryIntervalMillis)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html#ZkClient(java.lang.String,%20int)">ZkClient</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;zkhost,
+        int&nbsp;zkport)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html#close()">close</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html#connect()">connect</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html#create(java.lang.String,%20byte[],%20java.util.List,%20org.apache.zookeeper.CreateMode)">create</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;path,
+      byte[]&nbsp;data,
+      <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 
title="java.util中的类或接口">List</a>&lt;org.apache.zookeeper.data.ACL&gt;&nbsp;acl,
+      org.apache.zookeeper.CreateMode&nbsp;createMode)</code>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">
  NONSEQUENTIAL create is idempotent operation.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkUtil.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkUtil.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkUtil.html
index 54d4541..3c6f052 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkUtil.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZkUtil.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -263,3 +264,266 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ZkUtil (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ZkUtil (Trafodion Database Connectivity 
Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/ZkUtil.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/zookeeper/ZkUtil.html" 
target="_top">框架</a></li>
+<li><a href="ZkUtil.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.zookeeper</div>
+<h2 title="ç±» ZkUtil" class="title">ç±» ZkUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.zookeeper.ZkUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ZkUtil</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkUtil.html#ZkUtil()">ZkUtil</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/zookeeper/ZkUtil.html#main(java.lang.String[])">main</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()"
 title="java.lang中的类或接口">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)"
 title="java.lang中的类或接口">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()"
 title="java.lang中的类或接口">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()"
 title="java.lang中的类或接口">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()"
 title="java.lang中的类或接口">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()"
 title="java.lang中的类或接口">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()"
 title="java.lang中的类或接口">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)"
 title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a name="ZkUtil()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ZkUtil</h4>
+<pre>public&nbsp;ZkUtil()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="main(java.lang.String[])">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>main</h4>
+<pre>public static&nbsp;void&nbsp;main(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>[]&nbsp;args)
+                 throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></pre>
+<dl><dt><span class="strong">抛出:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></code></dd></dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/ZkUtil.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/zookeeper/ZkUtil.html" 
target="_top">框架</a></li>
+<li><a href="ZkUtil.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html
index d49a272..679623b 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -103,6 +104,109 @@
 <br>
 <pre>public class <span class="strong">ZooKeeperMainServerArg</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ZooKeeperMainServerArg (Trafodion Database Connectivity Services 2.3.0 
API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="ZooKeeperMainServerArg (Trafodion Database 
Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">ç±»</li>
+<li><a href="class-use/ZooKeeperMainServerArg.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/trafodion/dcs/zookeeper/ZkUtil.html" 
title="org.trafodion.dcs.zookeeper中的类"><span 
class="strong">上一个类</span></a></li>
+<li>下一个类</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html"
 target="_top">框架</a></li>
+<li><a href="ZooKeeperMainServerArg.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.zookeeper</div>
+<h2 title="ç±» ZooKeeperMainServerArg" class="title">ç±» 
ZooKeeperMainServerArg</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.zookeeper.ZooKeeperMainServerArg</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ZooKeeperMainServerArg</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Tool for reading a ZooKeeper server from HBase XML 
configuration producing
  the '-server host:port' argument to pass ZooKeeperMain.  This program
  emits either '-server HOST:PORT" where HOST is one of the zk ensemble

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/DcsQuorumPeer.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/DcsQuorumPeer.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/DcsQuorumPeer.html
index e3dc796..a15de24 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/DcsQuorumPeer.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/DcsQuorumPeer.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -119,3 +120,122 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.zookeeper.DcsQuorumPeer的使用 (Trafodion 
Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="\u7C7B 
org.trafodion.dcs.zookeeper.DcsQuorumPeer\u7684\u4F7F\u7528 (Trafodion Database 
Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/zookeeper/DcsQuorumPeer.html" 
title="org.trafodion.dcs.zookeeper中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/zookeeper/class-use/DcsQuorumPeer.html"
 target="_top">框架</a></li>
+<li><a href="DcsQuorumPeer.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.zookeeper.DcsQuorumPeer 的使用" 
class="title">类 org.trafodion.dcs.zookeeper.DcsQuorumPeer<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.zookeeper.DcsQuorumPeer的用法</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/zookeeper/DcsQuorumPeer.html" 
title="org.trafodion.dcs.zookeeper中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/zookeeper/class-use/DcsQuorumPeer.html"
 target="_top">框架</a></li>
+<li><a href="DcsQuorumPeer.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKConfig.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKConfig.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKConfig.html
index c0c0acf..ae82af1 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKConfig.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKConfig.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -119,3 +120,122 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.zookeeper.ZKConfig的使用 (Trafodion Database 
Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="\u7C7B 
org.trafodion.dcs.zookeeper.ZKConfig\u7684\u4F7F\u7528 (Trafodion Database 
Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/zookeeper/ZKConfig.html" 
title="org.trafodion.dcs.zookeeper中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/zookeeper/class-use/ZKConfig.html"
 target="_top">框架</a></li>
+<li><a href="ZKConfig.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.zookeeper.ZKConfig 的使用" 
class="title">类 org.trafodion.dcs.zookeeper.ZKConfig<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.zookeeper.ZKConfig的用法</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/zookeeper/ZKConfig.html" 
title="org.trafodion.dcs.zookeeper中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/zookeeper/class-use/ZKConfig.html"
 target="_top">框架</a></li>
+<li><a href="ZKConfig.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKServerTool.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKServerTool.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKServerTool.html
index f4c5751..ba9cc59 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKServerTool.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZKServerTool.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -119,3 +120,122 @@
 <p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.zookeeper.ZKServerTool的使用 (Trafodion 
Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="\u7C7B 
org.trafodion.dcs.zookeeper.ZKServerTool\u7684\u4F7F\u7528 (Trafodion Database 
Connectivity Services 2.3.0 API)";
+    }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a 
name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" 
title="org.trafodion.dcs.zookeeper中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/zookeeper/class-use/ZKServerTool.html"
 target="_top">框架</a></li>
+<li><a href="ZKServerTool.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.zookeeper.ZKServerTool 的使用" 
class="title">类 org.trafodion.dcs.zookeeper.ZKServerTool<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.zookeeper.ZKServerTool的用法</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a 
name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" 
title="org.trafodion.dcs.zookeeper中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../../index-all.html">索引</a></li>
+<li><a href="../../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/zookeeper/class-use/ZKServerTool.html"
 target="_top">框架</a></li>
+<li><a href="ZKServerTool.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

Reply via email to