trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From li...@apache.org
Subject [10/51] [abbrv] [partial] trafodion-site git commit: Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
Date Fri, 06 Jul 2018 03:58:48 GMT
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/ZkClient.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZkClient.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZkClient.html
index f3b00e0..72f8a9b 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZkClient.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/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">
@@ -289,3 +290,292 @@
 <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.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="\u7C7B org.trafodion.dcs.zookeeper.ZkClient\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/ZkClient.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/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>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.zookeeper.ZkClient 的使用" class="title">类 org.trafodion.dcs.zookeeper.ZkClient<br>的使用</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表程序包和解释">
+<caption><span>使用<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</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.master">org.trafodion.dcs.master</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.master.listener">org.trafodion.dcs.master.listener</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.server">org.trafodion.dcs.server</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt">org.trafodion.dcs.servermt</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverHandler">org.trafodion.dcs.servermt.serverHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.master">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</a>中<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表方法和解释">
+<caption><span>返回<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的<a href="../../../../../org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</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"><code><a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a></code></td>
+<td class="colLast"><span class="strong">ServerManager.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/ServerManager.html#getZkClient()">getZkClient</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a></code></td>
+<td class="colLast"><span class="strong">DcsMaster.</span><code><strong><a href="../../../../../org/trafodion/dcs/master/DcsMaster.html#getZkClient()">getZkClient</a></strong>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的<a href="../../../../../org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/master/ServerManager.html#ServerManager(org.trafodion.dcs.master.DcsMaster,%20org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20long,%20org.trafodion.dcs.master.Metrics)">ServerManager</a></strong>(<a href="../../../../../org/trafodion/dcs/master/DcsMaster.html" title="org.trafodion.dcs.master中的类">DcsMaster</a>&nbsp;master,
+             org.apache.hadoop.conf.Configuration&nbsp;conf,
+             <a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc,
+             <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf,
+             long&nbsp;startupTimestamp,
+             <a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</a>&nbsp;metrics)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.master.listener">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</a>中<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的<a href="../../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/master/listener/ListenerService.html#ListenerService(org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20int,%20int,%20int,%20int,%20org.trafodion.dcs.master.Metrics,%20java.lang.String)">ListenerService</a></strong>(<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc,
+               <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf,
+               int&nbsp;port,
+               int&nbsp;portRange,
+               int&nbsp;requestTimeout,
+               int&nbsp;selectorTimeout,
+               <a href="../../../../../org/trafodion/dcs/master/Metrics.html" title="org.trafodion.dcs.master中的类">Metrics</a>&nbsp;metrics,
+               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;parentZnode)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.server">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</a>中<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的<a href="../../../../../org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/server/ServerManager.html#ServerManager(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20java.lang.String,%20int,%20int)">ServerManager</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+             <a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc,
+             <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf,
+             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;instance,
+             int&nbsp;infoPort,
+             int&nbsp;childServers)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>中<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的<a href="../../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/servermt/ServerManager.html#ServerManager(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20java.lang.String,%20int,%20int)">ServerManager</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+             <a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc,
+             <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf,
+             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;instance,
+             int&nbsp;infoPort,
+             int&nbsp;serverThreads)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/servermt/ServerUtils.html#ServerUtils(org.trafodion.dcs.servermt.serverHandler.ServerHandler,%20org.trafodion.dcs.zookeeper.ZkClient)">ServerUtils</a></strong>(<a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html" title="org.trafodion.dcs.servermt.serverHandler中的类">ServerHandler</a>&nbsp;server,
+           <a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverHandler">
+<!--   -->
+</a>
+<h3><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>中<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表构造器和解释">
+<caption><span>参数类型为<a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>的<a href="../../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>中的构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><strong><a href="../../../../../org/trafodion/dcs/servermt/serverHandler/ServerHandler.html#ServerHandler(org.apache.hadoop.conf.Configuration,%20org.trafodion.dcs.zookeeper.ZkClient,%20org.trafodion.dcs.util.DcsNetworkConfiguration,%20int,%20int,%20java.lang.String,%20org.trafodion.dcs.util.RetryCounterFactory,%20int,%20byte[],%20int)">ServerHandler</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+             <a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a>&nbsp;zkc,
+             <a href="../../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" title="org.trafodion.dcs.util中的类">DcsNetworkConfiguration</a>&nbsp;netConf,
+             int&nbsp;instance,
+             int&nbsp;infoPort,
+             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>&nbsp;masterHostName,
+             <a href="../../../../../org/trafodion/dcs/util/RetryCounterFactory.html" title="org.trafodion.dcs.util中的类">RetryCounterFactory</a>&nbsp;retryCounterFactory,
+             int&nbsp;assignedPort,
+             byte[]&nbsp;cert,
+             int&nbsp;serverThread)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</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><a href="../../../../../org/trafodion/dcs/zookeeper/ZkClient.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/ZkClient.html" target="_top">框架</a></li>
+<li><a href="ZkClient.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/ZkUtil.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZkUtil.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZkUtil.html
index cffea57..2ef291a 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZkUtil.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/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">
@@ -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.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="\u7C7B org.trafodion.dcs.zookeeper.ZkUtil\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/ZkUtil.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/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>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.zookeeper.ZkUtil 的使用" class="title">类 org.trafodion.dcs.zookeeper.ZkUtil<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.zookeeper.ZkUtil的用法</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/ZkUtil.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/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>
+<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/ZooKeeperMainServerArg.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZooKeeperMainServerArg.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZooKeeperMainServerArg.html
index 13efcca..18353d6 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/ZooKeeperMainServerArg.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/class-use/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">
@@ -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.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="\u7C7B org.trafodion.dcs.zookeeper.ZooKeeperMainServerArg\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/ZooKeeperMainServerArg.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/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>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.zookeeper.ZooKeeperMainServerArg 的使用" class="title">类 org.trafodion.dcs.zookeeper.ZooKeeperMainServerArg<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.zookeeper.ZooKeeperMainServerArg的用法</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/ZooKeeperMainServerArg.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/ZooKeeperMainServerArg.html" target="_top">框架</a></li>
+<li><a href="ZooKeeperMainServerArg.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/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-frame.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-frame.html
index 717c1f9..f828793 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-frame.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-frame.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">
@@ -23,3 +24,30 @@
 </div>
 </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 (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>
+<h1 class="bar"><a href="../../../../org/trafodion/dcs/zookeeper/package-summary.html" target="classFrame">org.trafodion.dcs.zookeeper</a></h1>
+<div class="indexContainer">
+<h2 title="类">类</h2>
+<ul title="类">
+<li><a href="DcsQuorumPeer.html" title="org.trafodion.dcs.zookeeper中的类" target="classFrame">DcsQuorumPeer</a></li>
+<li><a href="ZkClient.html" title="org.trafodion.dcs.zookeeper中的类" target="classFrame">ZkClient</a></li>
+<li><a href="ZKConfig.html" title="org.trafodion.dcs.zookeeper中的类" target="classFrame">ZKConfig</a></li>
+<li><a href="ZKServerTool.html" title="org.trafodion.dcs.zookeeper中的类" target="classFrame">ZKServerTool</a></li>
+<li><a href="ZkUtil.html" title="org.trafodion.dcs.zookeeper中的类" target="classFrame">ZkUtil</a></li>
+<li><a href="ZooKeeperMainServerArg.html" title="org.trafodion.dcs.zookeeper中的类" target="classFrame">ZooKeeperMainServerArg</a></li>
+</ul>
+</div>
+</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/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-summary.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-summary.html
index e37e15c..cfad7fe 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-summary.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-summary.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">
@@ -99,6 +100,105 @@
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" title="class in org.trafodion.dcs.zookeeper">ZKServerTool</a></td>
 <td class="colLast">
+=======
+<!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 (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.zookeeper (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 class="navBarCell1Rev">程序包</li>
+<li>类</li>
+<li><a href="package-use.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/version/util/package-summary.html">上一个程序包</a></li>
+<li>下一个程序包</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/zookeeper/package-summary.html" target="_top">框架</a></li>
+<li><a href="package-summary.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="程序包" class="title">程序包&nbsp;org.trafodion.dcs.zookeeper</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="packageSummary" 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>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/trafodion/dcs/zookeeper/DcsQuorumPeer.html" title="org.trafodion.dcs.zookeeper中的类">DcsQuorumPeer</a></td>
+<td class="colLast">
+<div class="block">DCS's version of ZooKeeper's QuorumPeer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类">ZkClient</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html" title="org.trafodion.dcs.zookeeper中的类">ZKConfig</a></td>
+<td class="colLast">
+<div class="block">Utility methods for reading, parsing, and building zookeeper configuration.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" title="org.trafodion.dcs.zookeeper中的类">ZKServerTool</a></td>
+<td class="colLast">
+>>>>>>> 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>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-tree.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-tree.html
index a6cc6cc..1664bdb 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-tree.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/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">
@@ -137,3 +138,140 @@
 <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 类分层结构 (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.zookeeper \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/version/util/package-tree.html">上一个</a></li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/zookeeper/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.zookeeper的分层结构</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.zookeeper.<a href="../../../../org/trafodion/dcs/zookeeper/DcsQuorumPeer.html" title="org.trafodion.dcs.zookeeper中的类"><span class="strong">DcsQuorumPeer</span></a></li>
+<li type="circle">org.trafodion.dcs.zookeeper.<a href="../../../../org/trafodion/dcs/zookeeper/ZkClient.html" title="org.trafodion.dcs.zookeeper中的类"><span class="strong">ZkClient</span></a> (implements org.apache.zookeeper.Watcher)</li>
+<li type="circle">org.trafodion.dcs.zookeeper.<a href="../../../../org/trafodion/dcs/zookeeper/ZKConfig.html" title="org.trafodion.dcs.zookeeper中的类"><span class="strong">ZKConfig</span></a></li>
+<li type="circle">org.trafodion.dcs.zookeeper.<a href="../../../../org/trafodion/dcs/zookeeper/ZKServerTool.html" title="org.trafodion.dcs.zookeeper中的类"><span class="strong">ZKServerTool</span></a></li>
+<li type="circle">org.trafodion.dcs.zookeeper.<a href="../../../../org/trafodion/dcs/zookeeper/ZkUtil.html" title="org.trafodion.dcs.zookeeper中的类"><span class="strong">ZkUtil</span></a></li>
+<li type="circle">org.trafodion.dcs.zookeeper.<a href="../../../../org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.html" title="org.trafodion.dcs.zookeeper中的类"><span class="strong">ZooKeeperMainServerArg</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/version/util/package-tree.html">上一个</a></li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/zookeeper/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/zookeeper/package-use.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-use.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-use.html
index edecf16..98a55d5 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/package-use.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/zookeeper/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">
@@ -209,3 +210,212 @@
 <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的使用 (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.zookeeper\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/zookeeper/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.zookeeper 的使用" class="title">程序包 org.trafodion.dcs.zookeeper<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/zookeeper/package-summary.html">org.trafodion.dcs.zookeeper</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.master">org.trafodion.dcs.master</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.master.listener">org.trafodion.dcs.master.listener</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt">org.trafodion.dcs.servermt</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#org.trafodion.dcs.servermt.serverHandler">org.trafodion.dcs.servermt.serverHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.master">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表类和解释">
+<caption><span><a href="../../../../org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</a>使用的<a href="../../../../org/trafodion/dcs/zookeeper/package-summary.html">org.trafodion.dcs.zookeeper</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/zookeeper/class-use/ZkClient.html#org.trafodion.dcs.master">ZkClient</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.master.listener">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表类和解释">
+<caption><span><a href="../../../../org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</a>使用的<a href="../../../../org/trafodion/dcs/zookeeper/package-summary.html">org.trafodion.dcs.zookeeper</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/zookeeper/class-use/ZkClient.html#org.trafodion.dcs.master.listener">ZkClient</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表类和解释">
+<caption><span><a href="../../../../org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a>使用的<a href="../../../../org/trafodion/dcs/zookeeper/package-summary.html">org.trafodion.dcs.zookeeper</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/zookeeper/class-use/ZkClient.html#org.trafodion.dcs.servermt">ZkClient</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.servermt.serverHandler">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 列表类和解释">
+<caption><span><a href="../../../../org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a>使用的<a href="../../../../org/trafodion/dcs/zookeeper/package-summary.html">org.trafodion.dcs.zookeeper</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/zookeeper/class-use/ZkClient.html#org.trafodion.dcs.servermt.serverHandler">ZkClient</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/zookeeper/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/overview-frame.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/overview-frame.html b/docs/2.3.0/dcs_reference/apidocs/overview-frame.html
index 4f5e604..722f928 100644
--- a/docs/2.3.0/dcs_reference/apidocs/overview-frame.html
+++ b/docs/2.3.0/dcs_reference/apidocs/overview-frame.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">
@@ -31,3 +32,38 @@
 <p>&nbsp;</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>概览列表 (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>
+<div class="indexHeader"><a href="allclasses-frame.html" target="packageFrame">所有类</a></div>
+<div class="indexContainer">
+<h2 title="程序包">程序包</h2>
+<ul title="程序包">
+<li><a href="org/trafodion/dcs/package-frame.html" target="packageFrame">org.trafodion.dcs</a></li>
+<li><a href="org/trafodion/dcs/http/package-frame.html" target="packageFrame">org.trafodion.dcs.http</a></li>
+<li><a href="org/trafodion/dcs/master/package-frame.html" target="packageFrame">org.trafodion.dcs.master</a></li>
+<li><a href="org/trafodion/dcs/master/listener/package-frame.html" target="packageFrame">org.trafodion.dcs.master.listener</a></li>
+<li><a href="org/trafodion/dcs/script/package-frame.html" target="packageFrame">org.trafodion.dcs.script</a></li>
+<li><a href="org/trafodion/dcs/server/package-frame.html" target="packageFrame">org.trafodion.dcs.server</a></li>
+<li><a href="org/trafodion/dcs/servermt/package-frame.html" target="packageFrame">org.trafodion.dcs.servermt</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverDriverInputOutput/package-frame.html" target="packageFrame">org.trafodion.dcs.servermt.serverDriverInputOutput</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverHandler/package-frame.html" target="packageFrame">org.trafodion.dcs.servermt.serverHandler</a></li>
+<li><a href="org/trafodion/dcs/servermt/serverSql/package-frame.html" target="packageFrame">org.trafodion.dcs.servermt.serverSql</a></li>
+<li><a href="org/trafodion/dcs/util/package-frame.html" target="packageFrame">org.trafodion.dcs.util</a></li>
+<li><a href="org/trafodion/dcs/version/util/package-frame.html" target="packageFrame">org.trafodion.dcs.version.util</a></li>
+<li><a href="org/trafodion/dcs/zookeeper/package-frame.html" target="packageFrame">org.trafodion.dcs.zookeeper</a></li>
+</ul>
+</div>
+<p>&nbsp;</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/overview-summary.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/overview-summary.html b/docs/2.3.0/dcs_reference/apidocs/overview-summary.html
index 70cf18a..7e41135 100644
--- a/docs/2.3.0/dcs_reference/apidocs/overview-summary.html
+++ b/docs/2.3.0/dcs_reference/apidocs/overview-summary.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,3 +182,184 @@
 <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>概览 (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="\u6982\u89C8 (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 class="navBarCell1Rev">概览</li>
+<li>程序包</li>
+<li>类</li>
+<li>使用</li>
+<li><a href="overview-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?overview-summary.html" target="_top">框架</a></li>
+<li><a href="overview-summary.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">Trafodion Database Connectivity Services 2.3.0 API</h1>
+</div>
+<div class="contentContainer">
+<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>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="org/trafodion/dcs/package-summary.html">org.trafodion.dcs</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/trafodion/dcs/http/package-summary.html">org.trafodion.dcs.http</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/trafodion/dcs/master/package-summary.html">org.trafodion.dcs.master</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/trafodion/dcs/master/listener/package-summary.html">org.trafodion.dcs.master.listener</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/trafodion/dcs/script/package-summary.html">org.trafodion.dcs.script</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/trafodion/dcs/servermt/package-summary.html">org.trafodion.dcs.servermt</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/trafodion/dcs/servermt/serverDriverInputOutput/package-summary.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/trafodion/dcs/servermt/serverHandler/package-summary.html">org.trafodion.dcs.servermt.serverHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/trafodion/dcs/servermt/serverSql/package-summary.html">org.trafodion.dcs.servermt.serverSql</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/trafodion/dcs/version/util/package-summary.html">org.trafodion.dcs.version.util</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/trafodion/dcs/zookeeper/package-summary.html">org.trafodion.dcs.zookeeper</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</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 class="navBarCell1Rev">概览</li>
+<li>程序包</li>
+<li>类</li>
+<li>使用</li>
+<li><a href="overview-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?overview-summary.html" target="_top">框架</a></li>
+<li><a href="overview-summary.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*


Mime
View raw message