[01/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:19 -0700 

Repository: trafodion-site
Updated Branches:
  refs/heads/asf-site a3f846c69 -> c7b10bad2


http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/rest_reference/apidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/rest_reference/apidocs/allclasses-frame.html 
b/docs/2.3.0/rest_reference/apidocs/allclasses-frame.html
index b318293..521910d 100644
--- a/docs/2.3.0/rest_reference/apidocs/allclasses-frame.html
+++ b/docs/2.3.0/rest_reference/apidocs/allclasses-frame.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <!-- NewPage -->
 <html lang="en">
@@ -61,3 +62,68 @@
 </div>
 </body>
 </html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:51 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>所有类 (Trafodion REST 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<h1 class="bar">所有类</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="org/trafodion/rest/util/Base64.html" 
title="org.trafodion.rest.util中的类" target="classFrame">Base64</a></li>
+<li><a href="org/trafodion/rest/util/Base64.Base64InputStream.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">Base64.Base64InputStream</a></li>
+<li><a href="org/trafodion/rest/util/Base64.Base64OutputStream.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">Base64.Base64OutputStream</a></li>
+<li><a href="org/trafodion/rest/util/Bytes.html" 
title="org.trafodion.rest.util中的类" target="classFrame">Bytes</a></li>
+<li><a href="org/trafodion/rest/client/Client.html" 
title="org.trafodion.rest.client中的类" target="classFrame">Client</a></li>
+<li><a href="org/trafodion/rest/client/Cluster.html" 
title="org.trafodion.rest.client中的类" target="classFrame">Cluster</a></li>
+<li><a href="org/trafodion/rest/util/ConfTool.html" 
title="org.trafodion.rest.util中的类" target="classFrame">ConfTool</a></li>
+<li><a href="org/trafodion/rest/Constants.html" 
title="org.trafodion.rest中的类" target="classFrame">Constants</a></li>
+<li><a href="org/trafodion/rest/util/GetJavaProperty.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">GetJavaProperty</a></li>
+<li><a href="org/trafodion/rest/GetStatusResponse.html" 
title="org.trafodion.rest中的类" 
target="classFrame">GetStatusResponse</a></li>
+<li><a href="org/trafodion/rest/provider/JAXBContextResolver.html" 
title="org.trafodion.rest.provider中的类" 
target="classFrame">JAXBContextResolver</a></li>
+<li><a href="org/trafodion/rest/util/JdbcT2Util.html" 
title="org.trafodion.rest.util中的类" target="classFrame">JdbcT2Util</a></li>
+<li><a href="org/trafodion/rest/util/JdbcT4Util.html" 
title="org.trafodion.rest.util中的类" target="classFrame">JdbcT4Util</a></li>
+<li><a href="org/trafodion/rest/util/NetworkConfiguration.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">NetworkConfiguration</a></li>
+<li><a 
href="org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.html" 
title="org.trafodion.rest.provider.producer中的类" 
target="classFrame">PlainTextMessageBodyProducer</a></li>
+<li><a href="org/trafodion/rest/RegisteredServer.html" 
title="org.trafodion.rest中的类" 
target="classFrame">RegisteredServer</a></li>
+<li><a href="org/trafodion/rest/ResourceBase.html" 
title="org.trafodion.rest中的类" target="classFrame">ResourceBase</a></li>
+<li><a href="org/trafodion/rest/ResourceConfig.html" 
title="org.trafodion.rest中的类" target="classFrame">ResourceConfig</a></li>
+<li><a href="org/trafodion/rest/client/Response.html" 
title="org.trafodion.rest.client中的类" target="classFrame">Response</a></li>
+<li><a href="org/trafodion/rest/util/RestConfiguration.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">RestConfiguration</a></li>
+<li><a href="org/trafodion/rest/RestConstants.html" 
title="org.trafodion.rest中的接口" 
target="classFrame"><i>RestConstants</i></a></li>
+<li><a href="org/trafodion/rest/RESTServlet.html" 
title="org.trafodion.rest中的类" target="classFrame">RESTServlet</a></li>
+<li><a href="org/trafodion/rest/util/RetryCounter.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">RetryCounter</a></li>
+<li><a href="org/trafodion/rest/util/RetryCounterFactory.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">RetryCounterFactory</a></li>
+<li><a href="org/trafodion/rest/RootResource.html" 
title="org.trafodion.rest中的类" target="classFrame">RootResource</a></li>
+<li><a href="org/trafodion/rest/RunningServer.html" 
title="org.trafodion.rest中的类" target="classFrame">RunningServer</a></li>
+<li><a href="org/trafodion/rest/script/ScriptContext.html" 
title="org.trafodion.rest.script中的类" 
target="classFrame">ScriptContext</a></li>
+<li><a href="org/trafodion/rest/script/ScriptManager.html" 
title="org.trafodion.rest.script中的类" 
target="classFrame">ScriptManager</a></li>
+<li><a href="org/trafodion/rest/script/ScriptManagerWatcher.html" 
title="org.trafodion.rest.script中的类" 
target="classFrame">ScriptManagerWatcher</a></li>
+<li><a href="org/trafodion/rest/ServerResource.html" 
title="org.trafodion.rest中的类" target="classFrame">ServerResource</a></li>
+<li><a href="org/trafodion/rest/util/Strings.html" 
title="org.trafodion.rest.util中的类" target="classFrame">Strings</a></li>
+<li><a href="org/trafodion/rest/TrafodionRest.html" 
title="org.trafodion.rest中的类" target="classFrame">TrafodionRest</a></li>
+<li><a href="org/trafodion/rest/TransactionsResource.html" 
title="org.trafodion.rest中的类" 
target="classFrame">TransactionsResource</a></li>
+<li><a href="org/trafodion/rest/version/util/VerGen.html" 
title="org.trafodion.rest.version.util中的类" 
target="classFrame">VerGen</a></li>
+<li><a href="org/trafodion/rest/version/util/VerGen.Version.html" 
title="org.trafodion.rest.version.util中的类" 
target="classFrame">VerGen.Version</a></li>
+<li><a href="org/trafodion/rest/VersionAnnotation.html" 
title="org.trafodion.rest中的注释" 
target="classFrame">VersionAnnotation</a></li>
+<li><a href="org/trafodion/rest/util/VersionInfo.html" 
title="org.trafodion.rest.util中的类" 
target="classFrame">VersionInfo</a></li>
+<li><a href="org/trafodion/rest/model/VersionModel.html" 
title="org.trafodion.rest.model中的类" 
target="classFrame">VersionModel</a></li>
+<li><a href="org/trafodion/rest/VersionResource.html" 
title="org.trafodion.rest中的类" target="classFrame">VersionResource</a></li>
+<li><a href="org/trafodion/rest/zookeeper/ZkClient.html" 
title="org.trafodion.rest.zookeeper中的类" 
target="classFrame">ZkClient</a></li>
+<li><a href="org/trafodion/rest/zookeeper/ZKConfig.html" 
title="org.trafodion.rest.zookeeper中的类" 
target="classFrame">ZKConfig</a></li>
+<li><a href="org/trafodion/rest/zookeeper/ZkQuorumPeer.html" 
title="org.trafodion.rest.zookeeper中的类" 
target="classFrame">ZkQuorumPeer</a></li>
+<li><a href="org/trafodion/rest/zookeeper/ZKServerTool.html" 
title="org.trafodion.rest.zookeeper中的类" 
target="classFrame">ZKServerTool</a></li>
+<li><a href="org/trafodion/rest/zookeeper/ZkUtil.html" 
title="org.trafodion.rest.zookeeper中的类" 
target="classFrame">ZkUtil</a></li>
+<li><a href="org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.html" 
title="org.trafodion.rest.zookeeper中的类" 
target="classFrame">ZooKeeperMainServerArg</a></li>
+</ul>
+</div>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for 
*Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*

Reply via email to