http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.Base64OutputStream.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.Base64OutputStream.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.Base64OutputStream.html
index c23b07d..f58bf07 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.Base64OutputStream.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.Base64OutputStream.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">
@@ -122,6 +123,128 @@
 <pre>public static class <span class="strong">Base64.Base64OutputStream</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/FilterOutputStream.html?is-external=true";
 title="class or interface in java.io">FilterOutputStream</a></pre>
 <div class="block">A <a 
href="../../../../org/trafodion/dcs/util/Base64.Base64OutputStream.html" 
title="class in 
org.trafodion.dcs.util"><code>Base64.Base64OutputStream</code></a> will write 
data to 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:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Base64.Base64OutputStream (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="Base64.Base64OutputStream (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/Base64.Base64OutputStream.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/Base64.Base64InputStream.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/Base64.Base64OutputStream.html"
 target="_top">框架</a></li>
+<li><a href="Base64.Base64OutputStream.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="#fields_inherited_from_class_java.io.FilterOutputStream">字段</a>&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.util</div>
+<h2 title="ç±» Base64.Base64OutputStream" class="title">ç±» 
Base64.Base64OutputStream</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><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true";
 title="java.io中的类或接口">java.io.OutputStream</a></li>
+<li>
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/FilterOutputStream.html?is-external=true";
 title="java.io中的类或接口">java.io.FilterOutputStream</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.util.Base64.Base64OutputStream</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html?is-external=true";
 title="java.io中的类或接口">Closeable</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Flushable.html?is-external=true";
 title="java.io中的类或接口">Flushable</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/AutoCloseable.html?is-external=true";
 title="java.lang中的类或接口">AutoCloseable</a></dd>
+</dl>
+<dl>
+<dt>封闭类:</dt>
+<dd><a href="../../../../org/trafodion/dcs/util/Base64.html" 
title="org.trafodion.dcs.util中的类">Base64</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="strong">Base64.Base64OutputStream</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/FilterOutputStream.html?is-external=true";
 title="java.io中的类或接口">FilterOutputStream</a></pre>
+<div class="block">A <a 
href="../../../../org/trafodion/dcs/util/Base64.Base64OutputStream.html" 
title="org.trafodion.dcs.util中的类"><code>Base64.Base64OutputStream</code></a>
 will write data to another
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
  <tt>OutputStream</tt>, given in the constructor, and
  encode/decode to/from Base64 notation on the fly.</div>
 <dl><dt><span class="strong">Since:</span></dt>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.html
index 03358bb..55a4280 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Base64.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -103,6 +104,109 @@
 <br>
 <pre>public class <span class="strong">Base64</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Base64 (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="Base64 (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/Base64.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/util/Base64.Base64InputStream.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/Base64.html" 
target="_top">框架</a></li>
+<li><a href="Base64.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><a href="#field_summary">字段</a>&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li><a href="#field_detail">字段</a>&nbsp;|&nbsp;</li>
+<li>构造器&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.util</div>
+<h2 title="ç±» Base64" class="title">ç±» Base64</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.util.Base64</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">Base64</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Encodes and decodes to and from Base64 notation.
 
  <p>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/ByteBufferUtils.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/ByteBufferUtils.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/ByteBufferUtils.html
index 5c33d25..42eda5f 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/ByteBufferUtils.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/ByteBufferUtils.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">
@@ -188,6 +189,194 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#indexOf(java.nio.ByteBuffer,%20java.nio.ByteBuffer)">indexOf</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a>&nbsp;buffer,
        <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a>&nbsp;pattern)</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:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ByteBufferUtils (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="ByteBufferUtils (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/ByteBufferUtils.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/Base64.Base64OutputStream.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/Bytes.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/ByteBufferUtils.html" 
target="_top">框架</a></li>
+<li><a href="ByteBufferUtils.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li>构造器&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.util</div>
+<h2 title="ç±» ByteBufferUtils" class="title">ç±» ByteBufferUtils</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.util.ByteBufferUtils</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">ByteBufferUtils</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">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#allocate(int,%20boolean)">allocate</a></strong>(int&nbsp;capacity,
+        boolean&nbsp;direct)</code>
+<div class="block">Allocate ByteBuffer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#charsetToString(int)">charsetToString</a></strong>(int&nbsp;charset)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static byte[]</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractByteArray(java.nio.ByteBuffer)">extractByteArray</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static byte[]</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractByteArrayLen(java.nio.ByteBuffer,%20int)">extractByteArrayLen</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf,
+                   int&nbsp;len)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static byte[]</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractByteString(java.nio.ByteBuffer)">extractByteString</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractShortString(java.nio.ByteBuffer)">extractShortString</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractString(java.nio.ByteBuffer)">extractString</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractStringWithCharset(java.nio.ByteBuffer)">extractStringWithCharset</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static long</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractUInt(java.nio.ByteBuffer)">extractUInt</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#extractUShort(java.nio.ByteBuffer)">extractUShort</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#gather(java.nio.ByteBuffer[])">gather</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>[]&nbsp;buffers)</code>
+<div class="block">Gather ByteBuffers to one ByteBuffer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#hasRemaining(java.nio.ByteBuffer[])">hasRemaining</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>[]&nbsp;buffers)</code>
+<div class="block">Judge ByteBuffers have remaining bytes.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#increaseCapacity(java.nio.ByteBuffer,%20int)">increaseCapacity</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buffer,
+                int&nbsp;size)</code>
+<div class="block">Increase ByteBuffer's capacity.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/ByteBufferUtils.html#indexOf(java.nio.ByteBuffer,%20java.nio.ByteBuffer)">indexOf</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;buffer,
+       <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="java.nio中的类或接口">ByteBuffer</a>&nbsp;pattern)</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">Returns the index within this buffer of the first 
occurrence of the
  specified pattern buffer.</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/Bytes.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Bytes.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Bytes.html
index 5756bdc..aff907f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Bytes.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/Bytes.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -103,6 +104,109 @@
 <br>
 <pre>public class <span class="strong">Bytes</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Bytes (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="Bytes (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/Bytes.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/ByteBufferUtils.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/DcsConfiguration.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/Bytes.html" 
target="_top">框架</a></li>
+<li><a href="Bytes.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="#method_summary">方法</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><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.util</div>
+<h2 title="ç±» Bytes" class="title">ç±» Bytes</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.util.Bytes</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">Bytes</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Utility class that handles byte arrays, conversions to/from 
other types,
  comparisons, hash code generation, manufacturing keys for HashMaps or
  HashSets, etc.</div>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfTool.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfTool.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfTool.html
index 31d7287..08abb4f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfTool.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfTool.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -103,6 +104,109 @@
 <br>
 <pre>public class <span class="strong">DcsConfTool</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DcsConfTool (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="DcsConfTool (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/DcsConfTool.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/DcsConfiguration.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/DcsConfTool.html" 
target="_top">框架</a></li>
+<li><a href="DcsConfTool.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.util</div>
+<h2 title="ç±» DcsConfTool" class="title">ç±» DcsConfTool</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.util.DcsConfTool</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">DcsConfTool</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Tool that prints out a configuration.
  Pass the configuration key on the command-line.</div>
 </li>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfiguration.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfiguration.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfiguration.html
index 990ed98..3f69c86 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfiguration.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsConfiguration.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -289,6 +290,295 @@ extends org.apache.hadoop.conf.Configuration</pre>
 <h4>main</h4>
 <pre>public static&nbsp;void&nbsp;main(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DcsConfiguration (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="DcsConfiguration (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/DcsConfiguration.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/Bytes.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/DcsConfTool.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/DcsConfiguration.html" 
target="_top">框架</a></li>
+<li><a href="DcsConfiguration.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_classes_inherited_from_class_org.apache.hadoop.conf.Configuration">嵌套</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.util</div>
+<h2 title="ç±» DcsConfiguration" class="title">ç±» DcsConfiguration</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.apache.hadoop.conf.Configuration</li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.util.DcsConfiguration</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Iterable.html?is-external=true";
 title="java.lang中的类或接口">Iterable</a>&lt;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true";
 title="java.util中的类或接口">Map.Entry</a>&lt;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>,<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&gt;&gt;, 
org.apache.hadoop.io.Writable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="strong">DcsConfiguration</span>
+extends org.apache.hadoop.conf.Configuration</pre>
+<div class="block">Adds dcs configuration files to a Configuration</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested_class_summary">
+<!--   -->
+</a>
+<h3>嵌套类概要</h3>
+<ul class="blockList">
+<li class="blockList"><a 
name="nested_classes_inherited_from_class_org.apache.hadoop.conf.Configuration">
+<!--   -->
+</a>
+<h3>从类继承的嵌套类/接口&nbsp;org.apache.hadoop.conf.Configuration</h3>
+<code>org.apache.hadoop.conf.Configuration.DeprecationDelta, 
org.apache.hadoop.conf.Configuration.IntegerRanges</code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsConfiguration.html#DcsConfiguration()">DcsConfiguration</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 
org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsConfiguration.html#addWmsResources(org.apache.hadoop.conf.Configuration)">addWmsResources</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static 
org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsConfiguration.html#create()">create</a></strong>()</code>
+<div class="block">Creates a Configuration with Dcs resources</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static 
org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsConfiguration.html#create(org.apache.hadoop.conf.Configuration)">create</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;that)</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/util/DcsConfiguration.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>
+<div class="block">For debugging.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsConfiguration.html#merge(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.conf.Configuration)">merge</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;destConf,
+     org.apache.hadoop.conf.Configuration&nbsp;srcConf)</code>
+<div class="block">Merge two configurations.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a 
name="methods_inherited_from_class_org.apache.hadoop.conf.Configuration">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;org.apache.hadoop.conf.Configuration</h3>
+<code>addDefaultResource, addDeprecation, addDeprecation, addDeprecation, 
addDeprecation, addDeprecations, addResource, addResource, addResource, 
addResource, addResource, addResource, clear, dumpConfiguration, 
dumpDeprecatedKeys, get, get, getBoolean, getClass, getClass, getClassByName, 
getClassByNameOrNull, getClasses, getClassLoader, getConfResourceAsInputStream, 
getConfResourceAsReader, getDouble, getEnum, getFile, getFinalParameters, 
getFloat, getInstances, getInt, getInts, getLocalPath, getLong, getLongBytes, 
getPassword, getPasswordFromConfig, getPasswordFromCredentialProviders, 
getPattern, getPropertySources, getProps, getRange, getRaw, getResource, 
getSocketAddr, getSocketAddr, getStringCollection, getStrings, getStrings, 
getTimeDuration, getTrimmed, getTrimmed, getTrimmedStringCollection, 
getTrimmedStrings, getTrimmedStrings, getValByRegex, hasWarnedDeprecation, 
isDeprecated, iterator, readFields, reloadConfiguration, set, set, setBoolean, 
setBooleanIfUnset, setClass, setC
 lassLoader, setDeprecatedProperties, setDouble, setEnum, setFloat, setIfUnset, 
setInt, setLong, setPattern, setQuietMode, setSocketAddr, setStrings, 
setTimeDuration, size, toString, unset, updateConnectAddr, updateConnectAddr, 
write, writeXml, writeXml</code></li>
+</ul>
+<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#wait()"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)"
 title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a name="DcsConfiguration()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DcsConfiguration</h4>
+<pre>public&nbsp;DcsConfiguration()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="addWmsResources(org.apache.hadoop.conf.Configuration)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addWmsResources</h4>
+<pre>public 
static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;addWmsResources(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+</li>
+</ul>
+<a name="create()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public 
static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;create()</pre>
+<div class="block">Creates a Configuration with Dcs resources</div>
+<dl><dt><span class="strong">返回:</span></dt><dd>a Configuration with Dcs 
resources</dd></dl>
+</li>
+</ul>
+<a name="create(org.apache.hadoop.conf.Configuration)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public 
static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;create(org.apache.hadoop.conf.Configuration&nbsp;that)</pre>
+<dl><dt><span class="strong">参数:</span></dt><dd><code>that</code> - 
Configuration to clone.</dd>
+<dt><span class="strong">返回:</span></dt><dd>a Configuration created with 
the dcs-*.xml files plus
+ the given configuration.</dd></dl>
+</li>
+</ul>
+<a name="merge(org.apache.hadoop.conf.Configuration, 
org.apache.hadoop.conf.Configuration)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre>public 
static&nbsp;void&nbsp;merge(org.apache.hadoop.conf.Configuration&nbsp;destConf,
+         org.apache.hadoop.conf.Configuration&nbsp;srcConf)</pre>
+<div class="block">Merge two configurations.</div>
+<dl><dt><span class="strong">参数:</span></dt><dd><code>destConf</code> - 
the configuration that will be overwritten with items
+                 from the srcConf</dd><dd><code>srcConf</code> - the source 
configuration</dd></dl>
+</li>
+</ul>
+<a name="main(java.lang.String[])">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>main</h4>
+<pre>public static&nbsp;void&nbsp;main(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>[]&nbsp;args)
+                 throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></pre>
+>>>>>>> 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">For debugging.  Dump configurations to system output as xml 
format.
  Master and RS configurations can also be dumped using
  http services. e.g. "curl http://master:60010/dump";</div>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsNetworkConfiguration.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsNetworkConfiguration.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsNetworkConfiguration.html
index 46258d7..296d953 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsNetworkConfiguration.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/DcsNetworkConfiguration.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">
@@ -349,3 +350,352 @@ 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:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DcsNetworkConfiguration (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="DcsNetworkConfiguration (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/DcsNetworkConfiguration.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/DcsConfTool.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/GetJavaProperty.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/DcsNetworkConfiguration.html"
 target="_top">框架</a></li>
+<li><a href="DcsNetworkConfiguration.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.util</div>
+<h2 title="ç±» DcsNetworkConfiguration" class="title">ç±» 
DcsNetworkConfiguration</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.util.DcsNetworkConfiguration</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">DcsNetworkConfiguration</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html#DcsNetworkConfiguration(org.apache.hadoop.conf.Configuration)">DcsNetworkConfiguration</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html#checkCloud()">checkCloud</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html#getCanonicalHostName(java.net.NetworkInterface,%20java.net.InetAddress)">getCanonicalHostName</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/net/NetworkInterface.html?is-external=true";
 title="java.net中的类或接口">NetworkInterface</a>&nbsp;ni,
+                    <a 
href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true";
 title="java.net中的类或接口">InetAddress</a>&nbsp;inet)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html#getExtHostAddress()">getExtHostAddress</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/util/DcsNetworkConfiguration.html#getExtInterfaceName()">getExtInterfaceName</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html#getHostName()">getHostName</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true";
 title="java.net中的类或接口">InetAddress</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html#getInetAddress(java.net.NetworkInterface)">getInetAddress</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/net/NetworkInterface.html?is-external=true";
 
title="java.net中的类或接口">NetworkInterface</a>&nbsp;ni)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/util/DcsNetworkConfiguration.html#getIntHostAddress()">getIntHostAddress</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()"
 title="java.lang中的类或接口">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)"
 title="java.lang中的类或接口">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()"
 title="java.lang中的类或接口">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()"
 title="java.lang中的类或接口">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()"
 title="java.lang中的类或接口">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()"
 title="java.lang中的类或接口">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()"
 title="java.lang中的类或接口">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)"
 title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a name="DcsNetworkConfiguration(org.apache.hadoop.conf.Configuration)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DcsNetworkConfiguration</h4>
+<pre>public&nbsp;DcsNetworkConfiguration(org.apache.hadoop.conf.Configuration&nbsp;conf)
+                        throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></pre>
+<dl><dt><span class="strong">抛出:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></code></dd></dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="getCanonicalHostName(java.net.NetworkInterface, 
java.net.InetAddress)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCanonicalHostName</h4>
+<pre>public&nbsp;void&nbsp;getCanonicalHostName(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/net/NetworkInterface.html?is-external=true";
 title="java.net中的类或接口">NetworkInterface</a>&nbsp;ni,
+                        <a 
href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true";
 title="java.net中的类或接口">InetAddress</a>&nbsp;inet)
+                          throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></pre>
+<dl><dt><span class="strong">抛出:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></code></dd></dl>
+</li>
+</ul>
+<a name="getInetAddress(java.net.NetworkInterface)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getInetAddress</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true";
 title="java.net中的类或接口">InetAddress</a>&nbsp;getInetAddress(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/net/NetworkInterface.html?is-external=true";
 title="java.net中的类或接口">NetworkInterface</a>&nbsp;ni)
+                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></pre>
+<dl><dt><span class="strong">抛出:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="java.lang中的类或接口">Exception</a></code></dd></dl>
+</li>
+</ul>
+<a name="checkCloud()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkCloud</h4>
+<pre>public&nbsp;void&nbsp;checkCloud()</pre>
+</li>
+</ul>
+<a name="getHostName()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHostName</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>&nbsp;getHostName()</pre>
+</li>
+</ul>
+<a name="getIntHostAddress()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIntHostAddress</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>&nbsp;getIntHostAddress()</pre>
+</li>
+</ul>
+<a name="getExtHostAddress()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getExtHostAddress</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>&nbsp;getExtHostAddress()</pre>
+</li>
+</ul>
+<a name="getExtInterfaceName()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getExtInterfaceName</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>&nbsp;getExtInterfaceName()</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/DcsNetworkConfiguration.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/DcsConfTool.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/GetJavaProperty.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/DcsNetworkConfiguration.html"
 target="_top">框架</a></li>
+<li><a href="DcsNetworkConfiguration.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/GetJavaProperty.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/GetJavaProperty.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/GetJavaProperty.html
index 42d12d6..310f955 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/GetJavaProperty.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/GetJavaProperty.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">
@@ -261,3 +262,264 @@ 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:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GetJavaProperty (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="GetJavaProperty (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/GetJavaProperty.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/DcsNetworkConfiguration.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/InfoServer.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/GetJavaProperty.html" 
target="_top">框架</a></li>
+<li><a href="GetJavaProperty.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.util</div>
+<h2 title="ç±» GetJavaProperty" class="title">ç±» GetJavaProperty</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.util.GetJavaProperty</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">GetJavaProperty</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></pre>
+<div class="block">A generic way for querying Java properties.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/util/GetJavaProperty.html#GetJavaProperty()">GetJavaProperty</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/util/GetJavaProperty.html#main(java.lang.String[])">main</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()"
 title="java.lang中的类或接口">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)"
 title="java.lang中的类或接口">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()"
 title="java.lang中的类或接口">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()"
 title="java.lang中的类或接口">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()"
 title="java.lang中的类或接口">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()"
 title="java.lang中的类或接口">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()"
 title="java.lang中的类或接口">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)"
 title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a name="GetJavaProperty()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>GetJavaProperty</h4>
+<pre>public&nbsp;GetJavaProperty()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="main(java.lang.String[])">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>main</h4>
+<pre>public static&nbsp;void&nbsp;main(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>[]&nbsp;args)</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/GetJavaProperty.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/DcsNetworkConfiguration.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/InfoServer.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/util/GetJavaProperty.html" 
target="_top">框架</a></li>
+<li><a href="GetJavaProperty.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2018. All rights 
reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/InfoServer.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/InfoServer.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/InfoServer.html
index e4906df..399eae3 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/InfoServer.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/util/InfoServer.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">
@@ -112,6 +113,118 @@
 <br>
 <pre>public class <span class="strong">InfoServer</span>
 extends <a href="../../../../org/trafodion/dcs/http/HttpServer.html" 
title="class in org.trafodion.dcs.http">HttpServer</a></pre>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:28 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>InfoServer (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="InfoServer (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/InfoServer.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/GetJavaProperty.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/util/JdbcT2Util.html" 
title="org.trafodion.dcs.util中的类"><span 
class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/util/InfoServer.html" 
target="_top">框架</a></li>
+<li><a href="InfoServer.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_classes_inherited_from_class_org.trafodion.dcs.http.HttpServer">嵌套</a>&nbsp;|&nbsp;</li>
+<li><a 
href="#fields_inherited_from_class_org.trafodion.dcs.http.HttpServer">字段</a>&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.util</div>
+<h2 title="ç±» InfoServer" class="title">ç±» InfoServer</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><a href="../../../../org/trafodion/dcs/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类">org.trafodion.dcs.http.HttpServer</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.util.InfoServer</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd><a href="../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="strong">InfoServer</span>
+extends <a href="../../../../org/trafodion/dcs/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类">HttpServer</a></pre>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
 <div class="block">Create a Jetty embedded server to answer http requests. The 
primary goal
  is to serve up status information for the server.
  There are three contexts:

Reply via email to