http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/VersionInfo.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/VersionInfo.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/VersionInfo.html
index b6ac972..3f70ab0 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/VersionInfo.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/class-use/VersionInfo.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.util.VersionInfo的使用 (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.util.VersionInfo\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/util/VersionInfo.html" 
title="org.trafodion.dcs.util中的类">类</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/util/class-use/VersionInfo.html"
 target="_top">框架</a></li>
+<li><a href="VersionInfo.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.util.VersionInfo 的使用" class="title">类 
org.trafodion.dcs.util.VersionInfo<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.util.VersionInfo的用法</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/util/VersionInfo.html" 
title="org.trafodion.dcs.util中的类">类</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/util/class-use/VersionInfo.html"
 target="_top">框架</a></li>
+<li><a href="VersionInfo.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/util/package-frame.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-frame.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-frame.html
index 14494ad..fb461b3 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-frame.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/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">
@@ -35,3 +36,42 @@
 </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.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>
+<h1 class="bar"><a 
href="../../../../org/trafodion/dcs/util/package-summary.html" 
target="classFrame">org.trafodion.dcs.util</a></h1>
+<div class="indexContainer">
+<h2 title="ç±»">ç±»</h2>
+<ul title="ç±»">
+<li><a href="Base64.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">Base64</a></li>
+<li><a href="Base64.Base64InputStream.html" 
title="org.trafodion.dcs.util中的类" 
target="classFrame">Base64.Base64InputStream</a></li>
+<li><a href="Base64.Base64OutputStream.html" 
title="org.trafodion.dcs.util中的类" 
target="classFrame">Base64.Base64OutputStream</a></li>
+<li><a href="ByteBufferUtils.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">ByteBufferUtils</a></li>
+<li><a href="Bytes.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">Bytes</a></li>
+<li><a href="DcsConfiguration.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">DcsConfiguration</a></li>
+<li><a href="DcsConfTool.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">DcsConfTool</a></li>
+<li><a href="DcsNetworkConfiguration.html" 
title="org.trafodion.dcs.util中的类" 
target="classFrame">DcsNetworkConfiguration</a></li>
+<li><a href="GetJavaProperty.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">GetJavaProperty</a></li>
+<li><a href="InfoServer.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">InfoServer</a></li>
+<li><a href="JdbcT2Util.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">JdbcT2Util</a></li>
+<li><a href="JdbcT4Util.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">JdbcT4Util</a></li>
+<li><a href="Log4jUtils.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">Log4jUtils</a></li>
+<li><a href="RetryCounter.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">RetryCounter</a></li>
+<li><a href="RetryCounterFactory.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">RetryCounterFactory</a></li>
+<li><a href="SqlUtils.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">SqlUtils</a></li>
+<li><a href="Strings.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">Strings</a></li>
+<li><a href="VersionInfo.html" title="org.trafodion.dcs.util中的类" 
target="classFrame">VersionInfo</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/util/package-summary.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-summary.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-summary.html
index 68870c3..5d7096c 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-summary.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/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">
@@ -90,6 +91,96 @@
 <td class="colFirst"><a 
href="../../../../org/trafodion/dcs/util/Base64.Base64InputStream.html" 
title="class in org.trafodion.dcs.util">Base64.Base64InputStream</a></td>
 <td class="colLast">
 <div class="block">A <a 
href="../../../../org/trafodion/dcs/util/Base64.Base64InputStream.html" 
title="class in 
org.trafodion.dcs.util"><code>Base64.Base64InputStream</code></a> will read 
data from another
+=======
+<!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.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.util (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/servermt/serverSql/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../org/trafodion/dcs/version/util/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/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.util</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/util/Base64.html" 
title="org.trafodion.dcs.util中的类">Base64</a></td>
+<td class="colLast">
+<div class="block">Encodes and decodes to and from Base64 notation.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/trafodion/dcs/util/Base64.Base64InputStream.html" 
title="org.trafodion.dcs.util中的类">Base64.Base64InputStream</a></td>
+<td class="colLast">
+<div class="block">A <a 
href="../../../../org/trafodion/dcs/util/Base64.Base64InputStream.html" 
title="org.trafodion.dcs.util中的类"><code>Base64.Base64InputStream</code></a>
 will read data from another
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
  <tt>InputStream</tt>, given in the constructor, and
  encode/decode to/from Base64 notation on the fly.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-tree.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-tree.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-tree.html
index 063c1e2..a82935b 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-tree.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/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">
@@ -173,3 +174,176 @@
 <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.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.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/servermt/serverSql/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../org/trafodion/dcs/version/util/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/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.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.util.<a 
href="../../../../org/trafodion/dcs/util/Base64.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">Base64</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">ByteBufferUtils</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/Bytes.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">Bytes</span></a></li>
+<li type="circle">org.apache.hadoop.conf.Configuration (implements 
java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Iterable.html?is-external=true";
 title="java.lang中的类或接口">Iterable</a>&lt;T&gt;, 
org.apache.hadoop.io.Writable)
+<ul>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/DcsConfiguration.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">DcsConfiguration</span></a></li>
+</ul>
+</li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/DcsConfTool.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">DcsConfTool</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">DcsNetworkConfiguration</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/GetJavaProperty.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">GetJavaProperty</span></a></li>
+<li type="circle">org.trafodion.dcs.http.<a 
href="../../../../org/trafodion/dcs/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">HttpServer</span></a> (implements org.trafodion.dcs.http.<a 
href="../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a>)
+<ul>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/InfoServer.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">InfoServer</span></a></li>
+</ul>
+</li>
+<li type="circle">java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true";
 title="java.io中的类或接口"><span class="strong">InputStream</span></a> 
(implements java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html?is-external=true";
 title="java.io中的类或接口">Closeable</a>)
+<ul>
+<li type="circle">java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/FilterInputStream.html?is-external=true";
 title="java.io中的类或接口"><span 
class="strong">FilterInputStream</span></a>
+<ul>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/Base64.Base64InputStream.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">Base64.Base64InputStream</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/JdbcT2Util.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">JdbcT2Util</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/JdbcT4Util.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">JdbcT4Util</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/Log4jUtils.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">Log4jUtils</span></a></li>
+<li type="circle">java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true";
 title="java.io中的类或接口"><span class="strong">OutputStream</span></a> 
(implements java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html?is-external=true";
 title="java.io中的类或接口">Closeable</a>, java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Flushable.html?is-external=true";
 title="java.io中的类或接口">Flushable</a>)
+<ul>
+<li type="circle">java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/FilterOutputStream.html?is-external=true";
 title="java.io中的类或接口"><span 
class="strong">FilterOutputStream</span></a>
+<ul>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/Base64.Base64OutputStream.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">Base64.Base64OutputStream</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/RetryCounter.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">RetryCounter</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/RetryCounterFactory.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">RetryCounterFactory</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/SqlUtils.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">SqlUtils</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/Strings.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">Strings</span></a></li>
+<li type="circle">org.trafodion.dcs.util.<a 
href="../../../../org/trafodion/dcs/util/VersionInfo.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">VersionInfo</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/servermt/serverSql/package-tree.html">上一个</a></li>
+<li><a 
href="../../../../org/trafodion/dcs/version/util/package-tree.html">下一个</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/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/util/package-use.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-use.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-use.html
index b81a18b..6c1d691 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/package-use.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/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">
@@ -239,3 +240,242 @@
 <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.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.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/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.util 的使用" class="title">程序包 
org.trafodion.dcs.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/util/package-summary.html">org.trafodion.dcs.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.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.serverHandler">org.trafodion.dcs.servermt.serverHandler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.util">org.trafodion.dcs.util</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/util/package-summary.html">org.trafodion.dcs.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/util/class-use/DcsNetworkConfiguration.html#org.trafodion.dcs.master">DcsNetworkConfiguration</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a 
href="../../../../org/trafodion/dcs/util/class-use/JdbcT4Util.html#org.trafodion.dcs.master">JdbcT4Util</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/util/package-summary.html">org.trafodion.dcs.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/util/class-use/DcsNetworkConfiguration.html#org.trafodion.dcs.master.listener">DcsNetworkConfiguration</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.server">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span><a 
href="../../../../org/trafodion/dcs/server/package-summary.html">org.trafodion.dcs.server</a>使用的<a
 
href="../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.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/util/class-use/InfoServer.html#org.trafodion.dcs.server">InfoServer</a>
+<div class="block">Create a Jetty embedded server to answer http 
requests.</div>
+</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/util/package-summary.html">org.trafodion.dcs.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/util/class-use/DcsNetworkConfiguration.html#org.trafodion.dcs.servermt.serverHandler">DcsNetworkConfiguration</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a 
href="../../../../org/trafodion/dcs/util/class-use/RetryCounterFactory.html#org.trafodion.dcs.servermt.serverHandler">RetryCounterFactory</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.util">
+<!--   -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span><a 
href="../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</a>使用的<a
 
href="../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.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/util/class-use/DcsNetworkConfiguration.html#org.trafodion.dcs.util">DcsNetworkConfiguration</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a 
href="../../../../org/trafodion/dcs/util/class-use/RetryCounter.html#org.trafodion.dcs.util">RetryCounter</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/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/version/util/VerGen.Version.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.Version.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.Version.html
index 868b70e..8aae71d 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.Version.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.Version.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">
@@ -311,3 +312,314 @@ 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>VerGen.Version (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="VerGen.Version (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/VerGen.Version.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/VerGen.html" 
title="org.trafodion.dcs.version.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li>下一个类</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/VerGen.Version.html"
 target="_top">框架</a></li>
+<li><a href="VerGen.Version.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><a href="#field_summary">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li><a href="#field_detail">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li>方法</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.version.util</div>
+<h2 title="ç±» VerGen.Version" class="title">ç±» VerGen.Version</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.version.util.VerGen.Version</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>封闭类:</dt>
+<dd><a href="../../../../../org/trafodion/dcs/version/util/VerGen.html" 
title="org.trafodion.dcs.version.util中的类">VerGen</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="strong">VerGen.Version</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_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>int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.Version.html#maj">maj</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.Version.html#micro">micro</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.Version.html#min">min</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<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/version/util/VerGen.Version.html#qualifier">qualifier</a></strong></code>&nbsp;</td>
+</tr>
+</table>
+</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/version/util/VerGen.Version.html#VerGen.Version()">VerGen.Version</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<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">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_detail">
+<!--   -->
+</a>
+<h3>字段详细资料</h3>
+<a name="maj">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>maj</h4>
+<pre>public&nbsp;int maj</pre>
+</li>
+</ul>
+<a name="min">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>min</h4>
+<pre>public&nbsp;int min</pre>
+</li>
+</ul>
+<a name="micro">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>micro</h4>
+<pre>public&nbsp;int micro</pre>
+</li>
+</ul>
+<a name="qualifier">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>qualifier</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a> qualifier</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a name="VerGen.Version()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>VerGen.Version</h4>
+<pre>public&nbsp;VerGen.Version()</pre>
+</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/VerGen.Version.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/VerGen.html" 
title="org.trafodion.dcs.version.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li>下一个类</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/VerGen.Version.html"
 target="_top">框架</a></li>
+<li><a href="VerGen.Version.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><a href="#field_summary">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li><a href="#field_detail">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li>方法</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/version/util/VerGen.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.html
index 2856cad..29affe5 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/VerGen.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">
@@ -167,6 +168,173 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.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="class or interface in java.lang">String</a>[]&nbsp;args)</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>VerGen (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="VerGen (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/VerGen.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/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/VerGen.html" 
target="_top">框架</a></li>
+<li><a href="VerGen.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><a href="#nested_class_summary">嵌套</a>&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.version.util</div>
+<h2 title="ç±» VerGen" class="title">ç±» VerGen</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.version.util.VerGen</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">VerGen</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">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested_class_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 class&nbsp;</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</a></strong></code>&nbsp;</td>
+</tr>
+</table>
+</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/version/util/VerGen.html#VerGen()">VerGen</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/version/util/VerGen.html#generateFile(java.io.File,%20org.trafodion.dcs.version.util.VerGen.Version,%20int,%20java.lang.String)">generateFile</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true";
 title="java.io中的类或接口">File</a>&nbsp;outputDir,
+            <a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</a>&nbsp;version,
+            int&nbsp;rev,
+            <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;buildDate)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.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>
+>>>>>>> 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">Emits a org.apache.zookeeper.version.Info interface file 
with version and
  revision information constants set to the values passed in as command
  line parameters.</div>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.Version.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.Version.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.Version.html
index a0d4d56..639c858 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.Version.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.Version.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">
@@ -175,3 +176,178 @@
 <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.VerGen.Version的使用 (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.version.util.VerGen.Version\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/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">类</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/version/util/class-use/VerGen.Version.html"
 target="_top">框架</a></li>
+<li><a href="VerGen.Version.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.version.util.VerGen.Version 的使用" 
class="title">ç±» 
org.trafodion.dcs.version.util.VerGen.Version<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/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</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">
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.version.util">
+<!--   -->
+</a>
+<h3><a 
href="../../../../../../org/trafodion/dcs/version/util/package-summary.html">org.trafodion.dcs.version.util</a>中<a
 href="../../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表方法和解释">
+<caption><span>返回<a 
href="../../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</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="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="../../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</a></code></td>
+<td class="colLast"><span class="strong">VerGen.</span><code><strong><a 
href="../../../../../../org/trafodion/dcs/version/util/VerGen.html#parseVersionString(java.lang.String)">parseVersionString</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;input)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表方法和解释">
+<caption><span>参数类型为<a 
href="../../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</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="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="strong">VerGen.</span><code><strong><a 
href="../../../../../../org/trafodion/dcs/version/util/VerGen.html#generateFile(java.io.File,%20org.trafodion.dcs.version.util.VerGen.Version,%20int,%20java.lang.String)">generateFile</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true";
 title="java.io中的类或接口">File</a>&nbsp;outputDir,
+            <a 
href="../../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</a>&nbsp;version,
+            int&nbsp;rev,
+            <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 
title="java.lang中的类或接口">String</a>&nbsp;buildDate)</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/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">类</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/version/util/class-use/VerGen.Version.html"
 target="_top">框架</a></li>
+<li><a href="VerGen.Version.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/class-use/VerGen.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.html
index fa614af..fa689b9 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/class-use/VerGen.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.version.util.VerGen的使用 (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.version.util.VerGen\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/version/util/VerGen.html" 
title="org.trafodion.dcs.version.util中的类">类</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/version/util/class-use/VerGen.html"
 target="_top">框架</a></li>
+<li><a href="VerGen.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.version.util.VerGen 的使用" 
class="title">类 org.trafodion.dcs.version.util.VerGen<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.version.util.VerGen的用法</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/version/util/VerGen.html" 
title="org.trafodion.dcs.version.util中的类">类</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/version/util/class-use/VerGen.html"
 target="_top">框架</a></li>
+<li><a href="VerGen.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-frame.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-frame.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-frame.html
index 317a247..c4b891e 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-frame.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/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">
@@ -19,3 +20,26 @@
 </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.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>
+<h1 class="bar"><a 
href="../../../../../org/trafodion/dcs/version/util/package-summary.html" 
target="classFrame">org.trafodion.dcs.version.util</a></h1>
+<div class="indexContainer">
+<h2 title="ç±»">ç±»</h2>
+<ul title="ç±»">
+<li><a href="VerGen.html" title="org.trafodion.dcs.version.util中的类" 
target="classFrame">VerGen</a></li>
+<li><a href="VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类" 
target="classFrame">VerGen.Version</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/version/util/package-summary.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-summary.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-summary.html
index 3d56e5b..828cb04 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/package-summary.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/version/util/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">
@@ -141,3 +142,144 @@
 <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 (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/util/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/zookeeper/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/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.version.util</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/version/util/VerGen.html" 
title="org.trafodion.dcs.version.util中的类">VerGen</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类">VerGen.Version</a></td>
+<td class="colLast">&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 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/util/package-summary.html">上一个程序åŒ
…</a></li>
+<li><a 
href="../../../../../org/trafodion/dcs/zookeeper/package-summary.html">下一个程序åŒ
…</a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/trafodion/dcs/version/util/package-summary.html"
 target="_top">框架</a></li>
+<li><a href="package-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*

Reply via email to