[09/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*

Thu, 05 Jul 2018 20:59:18 -0700 

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/overview-tree.html 
b/docs/2.3.0/dcs_reference/apidocs/overview-tree.html
index be7e3f4..71ea970 100644
--- a/docs/2.3.0/dcs_reference/apidocs/overview-tree.html
+++ b/docs/2.3.0/dcs_reference/apidocs/overview-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">
@@ -297,3 +298,300 @@
 <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="\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>程序包</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>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">框架</a></li>
+<li><a href="overview-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">所有程序包的分层结构</h1>
+<span class="strong">程序包分层结构:</span>
+<ul class="horizontal">
+<li><a href="org/trafodion/dcs/package-tree.html">org.trafodion.dcs</a>, </li>
+<li><a 
href="org/trafodion/dcs/http/package-tree.html">org.trafodion.dcs.http</a>, 
</li>
+<li><a 
href="org/trafodion/dcs/master/package-tree.html">org.trafodion.dcs.master</a>, 
</li>
+<li><a 
href="org/trafodion/dcs/master/listener/package-tree.html">org.trafodion.dcs.master.listener</a>,
 </li>
+<li><a 
href="org/trafodion/dcs/script/package-tree.html">org.trafodion.dcs.script</a>, 
</li>
+<li><a 
href="org/trafodion/dcs/server/package-tree.html">org.trafodion.dcs.server</a>, 
</li>
+<li><a 
href="org/trafodion/dcs/servermt/package-tree.html">org.trafodion.dcs.servermt</a>,
 </li>
+<li><a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/package-tree.html">org.trafodion.dcs.servermt.serverDriverInputOutput</a>,
 </li>
+<li><a 
href="org/trafodion/dcs/servermt/serverHandler/package-tree.html">org.trafodion.dcs.servermt.serverHandler</a>,
 </li>
+<li><a 
href="org/trafodion/dcs/servermt/serverSql/package-tree.html">org.trafodion.dcs.servermt.serverSql</a>,
 </li>
+<li><a 
href="org/trafodion/dcs/util/package-tree.html">org.trafodion.dcs.util</a>, 
</li>
+<li><a 
href="org/trafodion/dcs/version/util/package-tree.html">org.trafodion.dcs.version.util</a>,
 </li>
+<li><a 
href="org/trafodion/dcs/zookeeper/package-tree.html">org.trafodion.dcs.zookeeper</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.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/ClientData.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ClientData</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ClientData.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ClientData</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/Close.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">Close</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.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.html"
 title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">ConnectionContext</span></a></li>
+<li type="circle">org.trafodion.dcs.<a href="org/trafodion/dcs/Constants.html" 
title="org.trafodion.dcs中的类"><span 
class="strong">Constants</span></a></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.master.<a 
href="org/trafodion/dcs/master/DcsMaster.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">DcsMaster</span></a> (implements java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true";
 title="java.lang中的类或接口">Runnable</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.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.server.<a 
href="org/trafodion/dcs/server/DcsServer.html" 
title="org.trafodion.dcs.server中的类"><span 
class="strong">DcsServer</span></a> (implements java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true";
 title="java.lang中的类或接口">Runnable</a>)</li>
+<li type="circle">org.trafodion.dcs.servermt.<a 
href="org/trafodion/dcs/servermt/DcsServer.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">DcsServer</span></a> (implements java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true";
 title="java.lang中的类或接口">Runnable</a>)</li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">Descriptor2</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">Descriptor2List</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">ErrorDesc</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">ErrorDescList</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/FloatingIp.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">FloatingIp</span></a></li>
+<li type="circle">javax.servlet.GenericServlet (implements java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true";
 title="java.io中的类或接口">Serializable</a>, javax.servlet.Servlet, 
javax.servlet.ServletConfig)
+<ul>
+<li type="circle">javax.servlet.http.HttpServlet (implements java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true";
 title="java.io中的类或接口">Serializable</a>)
+<ul>
+<li type="circle">org.trafodion.dcs.http.<a 
href="org/trafodion/dcs/http/HttpServer.StackServlet.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">HttpServer.StackServlet</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/MasterStatusServlet.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">MasterStatusServlet</span></a></li>
+<li type="circle">org.trafodion.dcs.server.<a 
href="org/trafodion/dcs/server/ServerStatusServlet.html" 
title="org.trafodion.dcs.server中的类"><span 
class="strong">ServerStatusServlet</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.<a 
href="org/trafodion/dcs/servermt/ServerStatusServlet.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">ServerStatusServlet</span></a></li>
+</ul>
+</li>
+</ul>
+</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.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/Header.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">Header</span></a></li>
+<li type="circle">org.trafodion.dcs.http.<a 
href="org/trafodion/dcs/http/HtmlQuoting.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">HtmlQuoting</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">org.trafodion.dcs.http.<a 
href="org/trafodion/dcs/http/HttpServer.DummyServletFilter.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">HttpServer.DummyServletFilter</span></a> (implements 
javax.servlet.Filter)</li>
+<li type="circle">org.trafodion.dcs.http.<a 
href="org/trafodion/dcs/http/HttpServer.QuotingInputFilter.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">HttpServer.QuotingInputFilter</span></a> (implements 
javax.servlet.Filter)</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.master.listener.<a 
href="org/trafodion/dcs/master/listener/ListenerConstants.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerConstants</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/ListenerMetrics.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerMetrics</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">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/MasterLeaderElection.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">MasterLeaderElection</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/Metrics.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">Metrics</span></a></li>
+<li type="circle">org.trafodion.dcs.server.<a 
href="org/trafodion/dcs/server/Metrics.html" 
title="org.trafodion.dcs.server中的类"><span 
class="strong">Metrics</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.<a 
href="org/trafodion/dcs/servermt/Metrics.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">Metrics</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.html"
 title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">OutConnectionContext</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.master.<a 
href="org/trafodion/dcs/master/QueryPlanModel.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanModel</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/QueryPlanModel.PlanSummaryInfo.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanModel.PlanSummaryInfo</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/QueryPlanModel.QueryPlanData.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanModel.QueryPlanData</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/QueryPlanResponse.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">QueryPlanResponse</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/RegisteredServer.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">RegisteredServer</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/RequestCancelQuery.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">RequestCancelQuery</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/RequestGetObjectRef.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">RequestGetObjectRef</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/RequestUnknown.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">RequestUnknown</span></a></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.master.<a 
href="org/trafodion/dcs/master/RunningServer.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">RunningServer</span></a></li>
+<li type="circle">org.trafodion.dcs.script.<a 
href="org/trafodion/dcs/script/ScriptContext.html" 
title="org.trafodion.dcs.script中的类"><span 
class="strong">ScriptContext</span></a></li>
+<li type="circle">org.trafodion.dcs.script.<a 
href="org/trafodion/dcs/script/ScriptManager.html" 
title="org.trafodion.dcs.script中的类"><span 
class="strong">ScriptManager</span></a></li>
+<li type="circle">org.trafodion.dcs.script.<a 
href="org/trafodion/dcs/script/ScriptManagerWatcher.html" 
title="org.trafodion.dcs.script中的类"><span 
class="strong">ScriptManagerWatcher</span></a> (implements java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true";
 title="java.lang中的类或接口">Runnable</a>)</li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiGetCatalogs</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlClose</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlConnect</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlDisconnect</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlEndTransact</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlExecDirect</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlExecute</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlFetch</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlPrepare</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerApiSqlSetConnectAttr</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.<a 
href="org/trafodion/dcs/servermt/ServerConstants.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">ServerConstants</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">ServerException</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerHandler.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerHandler</span></a> (implements java.util.concurrent.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Callable.html?is-external=true";
 title="java.util.concurrent中的类或接口">Callable</a>&lt;V&gt;)</li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/ServerItem.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">ServerItem</span></a></li>
+<li type="circle">org.trafodion.dcs.master.<a 
href="org/trafodion/dcs/master/ServerManager.html" 
title="org.trafodion.dcs.master中的类"><span 
class="strong">ServerManager</span></a> (implements java.util.concurrent.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Callable.html?is-external=true";
 title="java.util.concurrent中的类或接口">Callable</a>&lt;V&gt;)</li>
+<li type="circle">org.trafodion.dcs.server.<a 
href="org/trafodion/dcs/server/ServerManager.html" 
title="org.trafodion.dcs.server中的类"><span 
class="strong">ServerManager</span></a> (implements java.util.concurrent.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Callable.html?is-external=true";
 title="java.util.concurrent中的类或接口">Callable</a>&lt;V&gt;)</li>
+<li type="circle">org.trafodion.dcs.servermt.<a 
href="org/trafodion/dcs/servermt/ServerManager.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">ServerManager</span></a> (implements java.util.concurrent.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Callable.html?is-external=true";
 title="java.util.concurrent中的类或接口">Callable</a>&lt;V&gt;)</li>
+<li type="circle">org.trafodion.dcs.servermt.<a 
href="org/trafodion/dcs/servermt/ServerUtils.html" 
title="org.trafodion.dcs.servermt中的类"><span 
class="strong">ServerUtils</span></a></li>
+<li type="circle">javax.servlet.ServletRequestWrapper (implements 
javax.servlet.ServletRequest)
+<ul>
+<li type="circle">javax.servlet.http.HttpServletRequestWrapper (implements 
javax.servlet.http.HttpServletRequest)
+<ul>
+<li type="circle">org.trafodion.dcs.http.<a 
href="org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">HttpServer.DummyServletFilter.RequestChecker</span></a></li>
+<li type="circle">org.trafodion.dcs.http.<a 
href="org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">HttpServer.QuotingInputFilter.RequestQuoter</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.html"
 title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">SetConnectionOption</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">SQLDataValue</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.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">SQLValue</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">SQLValueList</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.html"
 title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">SQLWarningOrError</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.html"
 title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">SQLWarningOrErrorList</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">java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Thread.html?is-external=true";
 title="java.lang中的类或接口"><span class="strong">Thread</span></a> 
(implements java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true";
 title="java.lang中的类或接口">Runnable</a>)
+<ul>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/ListenerService.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerService</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/ListenerWorker.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">ListenerWorker</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverHandler.<a 
href="org/trafodion/dcs/servermt/serverHandler/ServerWorker.html" 
title="org.trafodion.dcs.servermt.serverHandler中的类"><span 
class="strong">ServerWorker</span></a></li>
+</ul>
+</li>
+<li type="circle">org.trafodion.dcs.servermt.serverSql.<a 
href="org/trafodion/dcs/servermt/serverSql/TrafConnection.html" 
title="org.trafodion.dcs.servermt.serverSql中的类"><span 
class="strong">TrafConnection</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverSql.<a 
href="org/trafodion/dcs/servermt/serverSql/TrafResultSet.html" 
title="org.trafodion.dcs.servermt.serverSql中的类"><span 
class="strong">TrafResultSet</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverSql.<a 
href="org/trafodion/dcs/servermt/serverSql/TrafStatement.html" 
title="org.trafodion.dcs.servermt.serverSql中的类"><span 
class="strong">TrafStatement</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">UserDesc</span></a></li>
+<li type="circle">org.trafodion.dcs.master.listener.<a 
href="org/trafodion/dcs/master/listener/Util.html" 
title="org.trafodion.dcs.master.listener中的类"><span 
class="strong">Util</span></a></li>
+<li type="circle">org.trafodion.dcs.version.util.<a 
href="org/trafodion/dcs/version/util/VerGen.html" 
title="org.trafodion.dcs.version.util中的类"><span 
class="strong">VerGen</span></a></li>
+<li type="circle">org.trafodion.dcs.version.util.<a 
href="org/trafodion/dcs/version/util/VerGen.Version.html" 
title="org.trafodion.dcs.version.util中的类"><span 
class="strong">VerGen.Version</span></a></li>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/Version.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">Version</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>
+<li type="circle">org.trafodion.dcs.servermt.serverDriverInputOutput.<a 
href="org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.html" 
title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类"><span 
class="strong">VersionList</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>
+<h2 title="接口分层结构">接口分层结构</h2>
+<ul>
+<li type="circle">org.trafodion.dcs.http.<a 
href="org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口"><span 
class="strong">FilterContainer</span></a></li>
+</ul>
+<h2 title="注释类型分层结构">注释类型分层结构</h2>
+<ul>
+<li type="circle">org.trafodion.dcs.<a 
href="org/trafodion/dcs/VersionAnnotation.html" 
title="org.trafodion.dcs中的注释"><span 
class="strong">VersionAnnotation</span></a> (implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="java.lang.annotation中的类或接口">Annotation</a>)</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>程序包</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>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">框架</a></li>
+<li><a href="overview-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/serialized-form.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/serialized-form.html 
b/docs/2.3.0/dcs_reference/apidocs/serialized-form.html
index feaa740..9975b64 100644
--- a/docs/2.3.0/dcs_reference/apidocs/serialized-form.html
+++ b/docs/2.3.0/dcs_reference/apidocs/serialized-form.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">
@@ -178,3 +179,181 @@
 <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="\u5E8F\u5217\u5316\u8868\u683C (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>程序包</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?serialized-form.html" target="_top">框架</a></li>
+<li><a href="serialized-form.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">序列化表格</h1>
+</div>
+<div class="serializedFormContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2 title="程序包">程序包&nbsp;org.trafodion.dcs.http</h2>
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.http.HttpServer.StackServlet">
+<!--   -->
+</a>
+<h3>ç±»<a href="org/trafodion/dcs/http/HttpServer.StackServlet.html" 
title="org.trafodion.dcs.http中的类">org.trafodion.dcs.http.HttpServer.StackServlet</a>扩展javax.servlet.http.HttpServlet实现可序列化</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>-6284183679759467039L</dd>
+</dl>
+</li>
+</ul>
+</li>
+<li class="blockList">
+<h2 title="程序包">程序包&nbsp;org.trafodion.dcs.master</h2>
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.master.MasterStatusServlet">
+<!--   -->
+</a>
+<h3>ç±»<a href="org/trafodion/dcs/master/MasterStatusServlet.html" 
title="org.trafodion.dcs.master中的类">org.trafodion.dcs.master.MasterStatusServlet</a>扩展javax.servlet.http.HttpServlet实现可序列化</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+</li>
+</ul>
+</li>
+<li class="blockList">
+<h2 title="程序包">程序包&nbsp;org.trafodion.dcs.server</h2>
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.server.ServerStatusServlet">
+<!--   -->
+</a>
+<h3>ç±»<a href="org/trafodion/dcs/server/ServerStatusServlet.html" 
title="org.trafodion.dcs.server中的类">org.trafodion.dcs.server.ServerStatusServlet</a>扩展javax.servlet.http.HttpServlet实现可序列化</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+</li>
+</ul>
+</li>
+<li class="blockList">
+<h2 title="程序包">程序包&nbsp;org.trafodion.dcs.servermt</h2>
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.servermt.ServerStatusServlet">
+<!--   -->
+</a>
+<h3>ç±»<a href="org/trafodion/dcs/servermt/ServerStatusServlet.html" 
title="org.trafodion.dcs.servermt中的类">org.trafodion.dcs.servermt.ServerStatusServlet</a>扩展javax.servlet.http.HttpServlet实现可序列化</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+</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>程序包</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?serialized-form.html" target="_top">框架</a></li>
+<li><a href="serialized-form.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/failsafe-report.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/failsafe-report.html 
b/docs/2.3.0/dcs_reference/failsafe-report.html
index 8a15c38..9c3342d 100644
--- a/docs/2.3.0/dcs_reference/failsafe-report.html
+++ b/docs/2.3.0/dcs_reference/failsafe-report.html
@@ -1,5 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<<<<<<< HEAD
 <!-- Generated by Apache Maven Doxia Site Renderer 1.4 at 2018-07-03 -->
+=======
+<!-- Generated by Apache Maven Doxia Site Renderer 1.4 at 2018-07-06 -->
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +14,11 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" 
media="print" />
+<<<<<<< HEAD
     <meta name="Date-Revision-yyyymmdd" content="20180703" />
+=======
+    <meta name="Date-Revision-yyyymmdd" content="20180706" />
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +35,11 @@
             
                     
                 <div class="xleft">
+<<<<<<< HEAD
         <span id="publishDate">Last Published: 2018-07-03</span>
+=======
+        <span id="publishDate">Last Published: 2018-07-06</span>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
                   &nbsp;| <span id="projectVersion">Version: 2.3.0</span>
                       </div>
             <div class="xright">                    <a href="./" 
title="Trafodion Database Connectivity Services">Trafodion Database 
Connectivity Services</a>

Reply via email to