http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/release-notes-1-0-0.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-0-0.md 
b/docs/src/site/markdown/release-notes-1-0-0.md
new file mode 100644
index 0000000..71abf33
--- /dev/null
+++ b/docs/src/site/markdown/release-notes-1-0-0.md
@@ -0,0 +1,255 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+This is the source-only release of the Apache Trafodion (incubating) project. 
This release provides a number of new features and improvements across the 
project plus a large number of bug fixes.
+
+Build instructions are available 
[here](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61316378).
+
+# Supported Platforms
+The following platforms are supported in this release.
+
+<span>
+  <table>
+    <tr>
+      <td>**Operating Systems**</td>
+      <td>CentOS 6.5 -- 6.7</td>
+    </tr>
+    <tr>
+      <td>**Hadoop Distributions**</td>
+      <td>Cloudera CDH distribution 5.1 and Hortonworks distribution HDP 
2.1</td>
+     </tr>
+    <tr>
+      <td>**Java Version**</td>
+      <td>JDK 1.7.0_67 or newer</td>
+    </tr>
+    <tr>
+      <td>**HBase Version**</td>
+      <td>HBase 0.98.x</td>
+    </tr>
+  </table>
+</span>
+
+# Enhancements
+
+This release contains the following new features.
+
+<span>
+  <table>
+    <tr>
+      <th>Category</th>
+      <th>Feature</th>
+      <th>Defect ID</th>
+    </tr>
+    <tr>
+      <td>**High Availability**</td>
+      <td>Production Ready:
+        <ul>
+          <li>Recovery from Trafodion infrastructure process failures. 
(Transaction Manager, Monitor)</li>
+          <li>Recovery from HBase Region Server failures.</li>
+          <li>Recovery from node failures.</li>
+          <li>Recovery from catastrophic system failures.</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Performance**</td>
+      <td>Production Ready:
+        <ul>
+          <li>[Automated Update 
Statistics](https://blueprints.launchpad.net/trafodion/+spec/ustat-automation) 
(initial, basic support).</li>
+          <li>Nested join enhancements.</li>
+          <li>Index support enhancements.</li>
+          <li>Scan performance.</li>
+        </ul>
+        Technology Preview:
+        <ul>
+          <li>[Multi-Temperature 
Data](https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning) 
(Complete But Not Tested)</li>
+        </ul>
+        For more information about automated update statistics and index 
support enhancements, see the [Trafodion SQL Reference 
Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Usability**</td>
+      <td>Technology Preview:
+        <ul>
+          <li>[Native HBase 
Tables](https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables)
 — Select/insert/update/delete data. (Complete But Not Tested)</li>
+          <li>[Sequence 
numbers](https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers) and 
[IDENTITY 
column](https://blueprints.launchpad.net/trafodion/+spec/identity-column) 
(Complete But Not Tested)</li>
+          <li>Oracle compatibility features (disabled by default) (Complete 
But Not Tested)</li>
+          <li>[Large Objects 
(LOB)](https://blueprints.launchpad.net/trafodion/+spec/lob-support) support 
(Work in Progress)</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Database Movement and Connectivity**</td>
+      <td>Production Ready:
+        <ul>
+          <li>[Bulk 
Unload](https://blueprints.launchpad.net/trafodion/+spec/bulkunload)</li>
+        </ul>
+        Technology Preview:
+        <ul>
+          
<li>[Backup/Restore](https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore).
 (Complete But Not Tested)</li>
+          <li>Thread-Safe JDBC Type 2 Driver. (Complete But Not Tested)</li>
+        </ul>
+        For more information about the new UNLOAD statement, see the 
[Trafodion SQL Reference Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Manageability**</td>
+      <td>Production Ready:
+        <ul>
+          <li>Visibility of SQL runtime statistics via the [Runtime Management 
System 
(RMS)](https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms).</li>
+          <li>Ability to [Cancel 
Queries](https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel) 
(DML statements only, not DDL, update statistics, and additional child query 
operations).</li>
+          <li>[Event 
Handling](https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events)
 through UDFs and log4cpp.</li>
+        </ul>
+        Technology Preview:
+        <ul>
+          <li>Collection of session and query statistics in [Repository 
Tables](https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability) 
(disabled by default)</li>
+        </ul>
+        For more information about gathering SQL runtime statistics and 
canceling an executing query, see the [Trafodion SQL Reference 
Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Security**</td>
+      <td>Production Ready:
+        <ul>
+          <li>[ANSI Schema 
Support](https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas).</li>
+          <li>[Privilege checking for SPJs, UDFs, libraries, and sequence 
generators](https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates).</li>
+          <li>[Privilege checking for 
utilities](https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates).</li>
+          <li>[Metadata Query 
Invalidation](https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation)
 (that is, detection and propagation of privilege changes to SQL 
compilers).</li>
+        </ul>
+        For more information about ANSI schema support and privilege and 
authorization updates in this release, see the [Trafodion SQL Reference 
Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Stability**</td>
+      <td>
+        <ul>
+          <li>Fixes for 85 defects.</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+  </table>
+</span>
+
+# Fixes
+
+This release contains fixes to around 85 defects, including 25 critical 
defects, 54 high defects, and 10 medium and low defects. Those defects were 
filed through [Launchpad](https://launchpad.net/trafodion/+milestone/r1.1).
+
+# Known Issues
+
+## Getting TM error 97 when tables split or get moved
+
+**Defect:** [1274651](https://bugs.launchpad.net/trafodion/+bug/1274651)
+
+**Symptom:** HBase Region Splits, Load Balancing, and Error 97.
+
+**Cause:** As part of an HBase environment’s ongoing operations (and based 
on the policies configured for the HBase environment), an HBase region can 
either get split (into two daughter regions) or moved to a different region 
server. (Please see the blog: 
[http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/](http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/).)
 If that happens when a Trafodion transaction is active (and operates on rows 
within the region that is being split or load-balanced), then a subsequent 
transaction commit operation by the application might encounter an error 97. 
Please note that under such conditions the Trafodion Transaction Manager will 
abort the transaction and will preserve the integrity of the database.
+
+**Solution:** To minimize disruptions when this happens, we suggest that you 
use one or more of the following approaches:
+
+<ol>
+  <li>Enhance your JDBC application logic to retry when an error 97 is 
returned for a commit operation.</li>
+  <li>Update the HBase configuration to reduce the times when such disruptions 
happen. It involves updates to some properties that can be set in 
<code>hbase-site.xml</code> (or via the manageability interface of your Hadoop 
distribution).</li>
+    <ul>
+      <li>Set the maximum file size of an HBase Region to 100 GB. For example, 
set the value of the property <code>hbase.hregion.max.filesize</code> to 
<code>107374182400</code>.</li>
+      <li><p>Set the HBase region split policy to 
'<code>ConstantSizeRegionSplitPolicy</code>'. For example, set the value of the 
property <code>hbase.regionserver.region.split.policy</code> to 
<code>org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy</code>.</p>
 
+          <p><strong>NOTE</strong>: The split policy should already be set to 
'<code>onstantSizeRegionSplitPolicy</code>' by the Trafodion installer.</p>
+          <p><strong>Summary</strong></p>
+          <p>
+             <span>
+               <table>
+                 <tr>
+                   <th>Property</th>
+                   <th>Value</th>
+                 </tr>
+                 <tr>
+                   <td><code>hbase.hregion.max.filesize</code></td>
+                   <td><code>107374182400</code></td>
+                 </tr>
+                 <tr>
+                   <td><code>hbase.regionserver.region.split.policy</code></td>
+                   
<td><code>org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy</code></td>
+                 </tr>
+               </table>
+            </span>
+            More information: 
[http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/](http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/)
+          </p>
+       </li>
+    </ul>
+    <li><p>Disable HBase Region Load Balancing. Use the HBase shell command 
balance_switch false to disable the movement of a region from one server to 
another.</p>
+        <p><strong>Example</strong></p>
+        <pre>
+hbase shell
+hbase(main):002:0> balance_switch false
+true  -- Output will be the last setting of the balance_switch value
+0 row(s) in 0.0080 seconds
+        </pre> 
+    </li>
+    <li>
+    Pre-split the table into multiple regions by using the <code>SALT USING n 
PARTITIONS</code> clause when creating the table. The number of partitions that 
you specify could be a function of the number of region servers present in the 
HBase cluster. Here is a simple example in which the table INVENTORY is 
pre-split into four regions when created:
+    <pre>
+CREATE TABLE INVENTORY
+  (
+    ITEM_ID       INT UNSIGNED NO DEFAULT NOT NULL
+  , ITEM_TYPE     INT UNSIGNED NO DEFAULT NOT NULL
+  , ITEM_COUNT    INT UNSIGNED NO DEFAULT NOT NULL
+  , PRIMARY KEY (ITEM_ID ASC)
+  )  SALT USING 4 PARTITIONS
+  ;    </pre>
+    </li>
+</ol>
+
+## EXECUTE.BATCH update creates core-file
+
+**Defect:** [1274962](https://bugs.launchpad.net/trafodion/+bug/1274962)
+
+**Symptom:** <code>EXECUTE.BATCH</code> hangs for a long time doing updates, 
and the update creates a core file.
+
+**Cause:** To be determined.
+
+**Solution:** Batch updates and ODBC row arrays do not currently work.
+
+## Random update statistics failures with HBase OutOfOrderScannerNextException
+
+**Defect:** [1391271](https://bugs.launchpad.net/trafodion/+bug/1391271)
+
+**Symptom:** While running update statistics commands, you see HBase 
OutOfOrderScannerNextException errors.
+
+**Cause:** The default <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values might be too low given 
the size of the tables. Sampling in update statistics is implemented using the 
HBase Random RowFilter. For very large tables with several billion rows, the 
sampling ratio required to get a sample of 1 million rows is very small. This 
can result in HBase client connection timeout errors since there may be no row 
returned by a RegionServer for an extended period of time.
+
+**Solution:** Increase the <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values. We have found that 
increasing those values to 600 seconds (10 minutes) might sometimes prevent 
many timeout-related errors. For more information, see the [HBase Configuration 
and Fine Tuning 
Recommendations](https://wiki.trafodion.org/wiki/index.php/Configuration#Recommendations).
+
+If increasing the <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values does not work, try 
increasing the chosen sampling size. Choose a sampling percentage higher than 
the default setting of 1 million rows for large tables. For example, suppose 
table T has one billion rows. The following <code>UPDATE STATISTICS</code> 
statement will sample a million rows, or approximately one-tenth of one percent 
of the total rows:
+
+    update statistics for table T on every column sample;
+
+To sample one percent of the rows, regardless of the table size, you must 
explicitly state the sampling rate as follows:
+
+    update statistics for table T on every column sample random 1 percent;
+
+## Following update statistics, stats do not take effect immediately
+
+**Defect:** [1409937](https://bugs.launchpad.net/trafodion/+bug/1409937)
+
+**Symptom:**  Immediately following an update statistics operation, the 
generated query plan does not seem to reflect the existence of statistics. For 
example, in a session, you create, and populate a table and then run update 
statistics on the table, prepare a query, and exit. A serial plan is generated 
and the estimated cardinality is 100 for both tables. In a new session, you 
prepare the same query, and a parallel plan is generated where the estimated 
cardinality reflects the statistics.
+
+**Cause:** This is a day-one issue.
+
+**Solution:** Retry the query after two minutes. Set <code>CQD 
HIST_NO_STATS_REFRESH_INTERVAL</code> to '<code>0</code>'. Run an <code>UPDATE 
STATISTICS</code> statement. Perform DML operations in a different session.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/release-notes-1-0-1.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-0-1.md 
b/docs/src/site/markdown/release-notes-1-0-1.md
new file mode 100644
index 0000000..7ec9848
--- /dev/null
+++ b/docs/src/site/markdown/release-notes-1-0-1.md
@@ -0,0 +1,249 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+This is the source-only release of the Apache Trafodion (incubating) project. 
This release provides product-level collection of query statistics and critical 
bug fixes above [1.0.0](release-notes-1-0-0.html).
+
+Build instructions are available 
[here](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61316378).
+
+# Supported Platforms
+The following platforms are supported in this release.
+
+<span>
+  <table>
+    <tr>
+      <td>**Operating Systems**</td>
+      <td>CentOS 6.5 -- 6.7</td>
+    </tr>
+    <tr>
+      <td>**Hadoop Distributions**</td>
+      <td>Cloudera CDH distribution 5.1 and Hortonworks distribution HDP 
2.1</td>
+     </tr>
+    <tr>
+      <td>**Java Version**</td>
+      <td>JDK 1.7.0_67 or newer</td>
+    </tr>
+    <tr>
+      <td>**HBase Version**</td>
+      <td>HBase 0.98.x</td>
+    </tr>
+  </table>
+</span>
+
+# Enhancements
+
+This release contains the following new features.
+
+<span>
+  <table>
+    <tr>
+      <th>Category</th>
+      <th>Feature</th>
+      <th>Defect ID</th>
+    </tr>
+    <tr>
+      <td>**High Availability**</td>
+      <td>Production Ready:
+        <ul>
+          <li>Recovery from Trafodion infrastructure process failures. 
(Transaction Manager, Monitor)</li>
+          <li>Recovery from HBase Region Server failures.</li>
+          <li>Recovery from node failures.</li>
+          <li>Recovery from catastrophic system failures.</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Performance**</td>
+      <td>Production Ready:
+        <ul>
+          <li>[Automated Update 
Statistics](https://blueprints.launchpad.net/trafodion/+spec/ustat-automation) 
(initial, basic support).</li>
+          <li>Nested join enhancements.</li>
+          <li>Index support enhancements.</li>
+          <li>Scan performance.</li>
+        </ul>
+        Technology Preview:
+        <ul>
+          <li>[Multi-Temperature 
Data](https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning) 
(Complete But Not Tested)</li>
+        </ul>
+        For more information about automated update statistics and index 
support enhancements, see the [Trafodion SQL Reference 
Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Usability**</td>
+      <td>Technology Preview:
+        <ul>
+          <li>[Native HBase 
Tables](https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables)
 — Select/insert/update/delete data. (Complete But Not Tested)</li>
+          <li>[Sequence 
numbers](https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers) and 
[IDENTITY 
column](https://blueprints.launchpad.net/trafodion/+spec/identity-column) 
(Complete But Not Tested)</li>
+          <li>Oracle compatibility features (disabled by default) (Complete 
But Not Tested)</li>
+          <li>[Large Objects 
(LOB)](https://blueprints.launchpad.net/trafodion/+spec/lob-support) support 
(Work in Progress)</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Database Movement and Connectivity**</td>
+      <td>Production Ready:
+        <ul>
+          <li>[Bulk 
Unload](https://blueprints.launchpad.net/trafodion/+spec/bulkunload)</li>
+        </ul>
+        Technology Preview:
+        <ul>
+          
<li>[Backup/Restore](https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore).
 (Complete But Not Tested)</li>
+          <li>Thread-Safe JDBC Type 2 Driver. (Complete But Not Tested)</li>
+        </ul>
+        For more information about the new UNLOAD statement, see the 
[Trafodion SQL Reference Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Manageability**</td>
+      <td>Production Ready:
+        <ul>
+          <li>Visibility of SQL runtime statistics via the [Runtime Management 
System 
(RMS)](https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms).</li>
+          <li>Ability to [Cancel 
Queries](https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel) 
(DML statements only, not DDL, update statistics, and additional child query 
operations).</li>
+          <li>[Event 
Handling](https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events)
 through UDFs and log4cpp.</li>
+          <li>Collection of session and query statistics in [Repository 
Tables](https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability) 
(disabled by default)</li>
+        </ul>
+        For more information about gathering SQL runtime statistics and 
canceling an executing query, see the [Trafodion SQL Reference 
Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Security**</td>
+      <td>Production Ready:
+        <ul>
+          <li>[ANSI Schema 
Support](https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas).</li>
+          <li>[Privilege checking for SPJs, UDFs, libraries, and sequence 
generators](https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates).</li>
+          <li>[Privilege checking for 
utilities](https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates).</li>
+          <li>[Metadata Query 
Invalidation](https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation)
 (that is, detection and propagation of privilege changes to SQL 
compilers).</li>
+        </ul>
+        For more information about ANSI schema support and privilege and 
authorization updates in this release, see the [Trafodion SQL Reference 
Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).
+      </td>
+      <td></td>
+    </tr>
+  </table>
+</span>
+
+# Fixes
+
+This release contains fixes to around 85 defects, including 25 critical 
defects, 54 high defects, and 10 medium and low defects. Those defects were 
filed through [Launchpad](https://launchpad.net/trafodion/+milestone/r1.1).
+
+# Known Issues
+
+Release 1.0.1 provides fixes to these bugs:
+* **[1415165](https://bugs.launchpad.net/trafodion/+bug/1415165)**: MXOSRVR 
memory leak when stats are enabled
+* **[1421727](https://bugs.launchpad.net/trafodion/+bug/1421727)**: 
Default/aggregated stats type not publishing query stats
+* **[1416539](https://bugs.launchpad.net/trafodion/+bug/1416539)** Snapshot 
scan installer additions
+* **[1413418](https://bugs.launchpad.net/trafodion/+bug/1413418)**: Need 
metadata upgrade option in installer
+
+## Getting TM error 97 when tables split or get moved
+
+**Defect:** [1274651](https://bugs.launchpad.net/trafodion/+bug/1274651)
+
+**Symptom:** HBase Region Splits, Load Balancing, and Error 97.
+
+**Cause:** As part of an HBase environment’s ongoing operations (and based 
on the policies configured for the HBase environment), an HBase region can 
either get split (into two daughter regions) or moved to a different region 
server. (Please see the blog: 
[http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/](http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/).)
 If that happens when a Trafodion transaction is active (and operates on rows 
within the region that is being split or load-balanced), then a subsequent 
transaction commit operation by the application might encounter an error 97. 
Please note that under such conditions the Trafodion Transaction Manager will 
abort the transaction and will preserve the integrity of the database.
+
+**Solution:** To minimize disruptions when this happens, we suggest that you 
use one or more of the following approaches:
+
+<ol>
+  <li>Enhance your JDBC application logic to retry when an error 97 is 
returned for a commit operation.</li>
+  <li>Update the HBase configuration to reduce the times when such disruptions 
happen. It involves updates to some properties that can be set in 
<code>hbase-site.xml</code> (or via the manageability interface of your Hadoop 
distribution).</li>
+    <ul>
+      <li>Set the maximum file size of an HBase Region to 100 GB. For example, 
set the value of the property <code>hbase.hregion.max.filesize</code> to 
<code>107374182400</code>.</li>
+      <li><p>Set the HBase region split policy to 
'<code>ConstantSizeRegionSplitPolicy</code>'. For example, set the value of the 
property <code>hbase.regionserver.region.split.policy</code> to 
<code>org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy</code>.</p>
 
+          <p><strong>NOTE</strong>: The split policy should already be set to 
'<code>onstantSizeRegionSplitPolicy</code>' by the Trafodion installer.</p>
+          <p><strong>Summary</strong></p>
+          <p>
+             <span>
+               <table>
+                 <tr>
+                   <th>Property</th>
+                   <th>Value</th>
+                 </tr>
+                 <tr>
+                   <td><code>hbase.hregion.max.filesize</code></td>
+                   <td><code>107374182400</code></td>
+                 </tr>
+                 <tr>
+                   <td><code>hbase.regionserver.region.split.policy</code></td>
+                   
<td><code>org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy</code></td>
+                 </tr>
+               </table>
+            </span>
+            More information: 
[http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/](http://hortonworks.com/blog/apache-hbase-region-splitting-and-merging/)
+          </p>
+       </li>
+    </ul>
+    <li><p>Disable HBase Region Load Balancing. Use the HBase shell command 
balance_switch false to disable the movement of a region from one server to 
another.</p>
+        <p><strong>Example</strong></p>
+        <pre>
+hbase shell
+hbase(main):002:0> balance_switch false
+true  -- Output will be the last setting of the balance_switch value
+0 row(s) in 0.0080 seconds
+        </pre> 
+    </li>
+    <li>
+    Pre-split the table into multiple regions by using the <code>SALT USING n 
PARTITIONS</code> clause when creating the table. The number of partitions that 
you specify could be a function of the number of region servers present in the 
HBase cluster. Here is a simple example in which the table INVENTORY is 
pre-split into four regions when created:
+    <pre>
+CREATE TABLE INVENTORY
+  (
+    ITEM_ID       INT UNSIGNED NO DEFAULT NOT NULL
+  , ITEM_TYPE     INT UNSIGNED NO DEFAULT NOT NULL
+  , ITEM_COUNT    INT UNSIGNED NO DEFAULT NOT NULL
+  , PRIMARY KEY (ITEM_ID ASC)
+  )  SALT USING 4 PARTITIONS
+  ;    </pre>
+    </li>
+</ol>
+
+## EXECUTE.BATCH update creates core-file
+
+**Defect:** [1274962](https://bugs.launchpad.net/trafodion/+bug/1274962)
+
+**Symptom:** <code>EXECUTE.BATCH</code> hangs for a long time doing updates, 
and the update creates a core file.
+
+**Cause:** To be determined.
+
+**Solution:** Batch updates and ODBC row arrays do not currently work.
+
+## Random update statistics failures with HBase OutOfOrderScannerNextException
+
+**Defect:** [1391271](https://bugs.launchpad.net/trafodion/+bug/1391271)
+
+**Symptom:** While running update statistics commands, you see HBase 
OutOfOrderScannerNextException errors.
+
+**Cause:** The default <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values might be too low given 
the size of the tables. Sampling in update statistics is implemented using the 
HBase Random RowFilter. For very large tables with several billion rows, the 
sampling ratio required to get a sample of 1 million rows is very small. This 
can result in HBase client connection timeout errors since there may be no row 
returned by a RegionServer for an extended period of time.
+
+**Solution:** Increase the <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values. We have found that 
increasing those values to 600 seconds (10 minutes) might sometimes prevent 
many timeout-related errors. For more information, see the [HBase Configuration 
and Fine Tuning 
Recommendations](https://wiki.trafodion.org/wiki/index.php/Configuration#Recommendations).
+
+If increasing the <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values does not work, try 
increasing the chosen sampling size. Choose a sampling percentage higher than 
the default setting of 1 million rows for large tables. For example, suppose 
table T has one billion rows. The following <code>UPDATE STATISTICS</code> 
statement will sample a million rows, or approximately one-tenth of one percent 
of the total rows:
+
+    update statistics for table T on every column sample;
+
+To sample one percent of the rows, regardless of the table size, you must 
explicitly state the sampling rate as follows:
+
+    update statistics for table T on every column sample random 1 percent;
+
+## Following update statistics, stats do not take effect immediately
+
+**Defect:** [1409937](https://bugs.launchpad.net/trafodion/+bug/1409937)
+
+**Symptom:**  Immediately following an update statistics operation, the 
generated query plan does not seem to reflect the existence of statistics. For 
example, in a session, you create, and populate a table and then run update 
statistics on the table, prepare a query, and exit. A serial plan is generated 
and the estimated cardinality is 100 for both tables. In a new session, you 
prepare the same query, and a parallel plan is generated where the estimated 
cardinality reflects the statistics.
+
+**Cause:** This is a day-one issue.
+
+**Solution:** Retry the query after two minutes. Set <code>CQD 
HIST_NO_STATS_REFRESH_INTERVAL</code> to '<code>0</code>'. Run an <code>UPDATE 
STATISTICS</code> statement. Perform DML operations in a different session.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/release-notes-1-1-0.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-1-0.md 
b/docs/src/site/markdown/release-notes-1-1-0.md
new file mode 100644
index 0000000..af3a199
--- /dev/null
+++ b/docs/src/site/markdown/release-notes-1-1-0.md
@@ -0,0 +1,181 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+This is the source-only release of the Apache Trafodion (incubating) project. 
In addition to including a number of new features and improvements across the 
project, the focus of this release is to comply with Apache release guidelines.
+
+Build instructions are available 
[here](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61316378).
+
+# Supported Platforms
+The following platforms are supported in this release.
+
+<span>
+  <table>
+    <tr>
+      <td>**Operating Systems**</td>
+      <td>CentOS 6.5 -- 6.7</td>
+    </tr>
+    <tr>
+      <td>**Hadoop Distributions**</td>
+      <td>Cloudera distributions CDH 5.3.x<br />Hortonworks distribution HDP 
2.2</td>
+     </tr>
+    <tr>
+      <td>**Java Version**</td>
+      <td>JDK 1.7.0_67 or newer</td>
+    </tr>
+    <tr>
+      <td>**HBase Version**</td>
+      <td>HBase 0.98.x</td>
+    </tr>
+  </table>
+</span>
+
+# Enhancements
+
+This release contains the following new features.
+
+<span>
+  <table>
+    <tr>
+      <th>Category</th>
+      <th>Feature</th>
+      <th>Defect ID</th>
+    </tr>
+    <tr>
+      <td>**Marketability, Infrastructure, and Scalability**</td>
+      <td>
+        <ul>
+          <li>Critical and high defect repairs.</li>
+          <li>Infrastructure refresh, including support for HDP 2.2 and CDH 
5.3</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Performance**</td>
+      <td>
+        <ul>
+          <li>Query plan quality improvements identified by PoC/benchmarks, 
such as costing changes to help generate MDAM plans when appropriate.</li>
+          <li>Performance and hardening improvements to user-defined routines 
(UDRs) (that is, stored procedures and C scalar user-defined functions 
(UDFs)).</li>
+          <li>[Hybrid Query 
Cache](https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache), 
which improves transaction performance and efficiency by moving the 
compiler’s SQL similarity detection check to the parser phase. Query caching 
allows reuse of pre-existing optimized SQL execution plans thereby eliminating 
costly compile and optimization overhead.</li>
+          <li>[Skew 
Buster](https://blueprints.launchpad.net/trafodion/+spec/skew-buster), a 
patented feature in Trafodion that can recognize situations where data is 
skewed in intermediate stages of a query and adjust the query plan and 
execution time redistribution of intermediate data to ensure that all data is 
evenly distributed over all processing nodes.</li> 
+          <li>[Immediate Update 
Statistics](https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load)
 for the entire table based on the sample taken during fast data loading. 
(Technology Preview--Complete But Not Fully Tested)</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**High Availability (HA) and Distributed Transaction Management 
(DTM)**</td>
+      <td>
+        <ul>
+          <li>Transaction management efficiency and performance 
enhancements.</li>
+          <li>Improvement of overall cluster HA now that the Trafodion 
Transaction Manager (TM) process is a persistent process, which eliminates the 
triggering of a node failure if the TM fails.</li>
+          <li>DTM local transaction support to minimize the overhead of 
transactions by eliminating interactions with the TM process when the scope is 
local to the client that began the transaction. (Technology Preview--Work in 
Progress)</li>
+          <li>Ability to run DDL statements in transactions, thus providing 
database consistency protection for DDL operations. (Technology Preview--Work 
in Progress)</li>
+          <li>Stateless/Stateful Concurrency Control (SSCC), which ensures 
that transactions prevent data contention anomalies that can corrupt the 
consistency of a database. It works by preventing user transactions that 
interfere with each other’s data. SSCC is an extension of the Snapshot 
Isolation (SI) algorithm. SI prevents the majority of anomalies associated with 
data corruption and provides superior isolation to Multi-Version Concurrency 
Control (MVCC), which is used by DTM today. (Technology Preview--Work in 
Progress)</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Usability**</td>
+      <td>
+        <ul>
+          <li>Production-ready version of the [Backup/Restore 
Utility](https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore), which 
allows you to backup and restore a Trafodion database while it is offline.</li>
+          <li>Parallel data loader/extractor tool called 
"[odb](docs/Trafodion_odb_User_Guide.pdf)" for [trickle data loading and 
extraction](https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables)
 to and from Trafodion tables.</li>
+          <li>[Metadata Cleanup 
Utility](https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup), which is 
used to cleanup metadata tables after a failed DDL statement (Technology 
Preview--Complete But Not Tested)</li>
+          <li>[Table-Mapping User-Defined Functions 
(TMUDF)](https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface)
 written in C++. (Technology Preview--Complete But Not Tested)</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Manageability**</td>
+      <td>
+        <ul>
+          <li>Support for HP Data Services Manager (HP DSM), a unified, 
browser-based tool for management of Hadoop, Vertica, and now Trafodion data 
services. **NOTE**: The version of HP DSM that integrates with Trafodion is not 
yet available.</li>
+          <li>Stability and overhead optimizations to reduce the overhead of 
capturing and maintaining query performance information (in repository 
tables).</li>
+          <li>Query cancel for DDL, update statistics, and additional child 
query operations. For details, see the CONTROL QUERY CANCEL statement in the 
[Trafodion SQL Reference 
Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).</li>        
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Security**</td>
+      <td>
+        <ul>
+          <li>Security subsystem hardening improvements including performance 
and QA testing.</li>
+          <li>Security enhancements for the Trafodion metadata, data loader, 
and Data Connectivity Services (DCS).</li>
+          <li>Upgrade authorization.</li>
+          <li>Ability to grant privileges on behalf of a role using the 
GRANTED BY clause. For details, see the GRANT statements in the [Trafodion SQL 
Reference Manual](docs/Trafodion_SQL_Reference_Manaual.pdf).</li>
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>**Installer**</td>
+      <td>
+        <ul>
+          <li>Prompts to configure and enable security.</li>
+          <li>Support for the latest distributions, HDP 2.2 and CDH 5.3.</li>  
      
+        </ul>
+      </td>
+      <td></td>
+    </tr>
+  </table>
+</span>
+
+# Fixes
+
+This release contains fixes to around 96 defects, including 17 critical 
defects, 53 high defects, 20 medium defects, and two low defects. Those defects 
were filed through [Launchpad](https://launchpad.net/trafodion/+milestone/r1.1).
+
+# Known Issues
+
+## EXECUTE.BATCH update creates core-file
+
+**Defect:** [1274962](https://bugs.launchpad.net/trafodion/+bug/1274962)
+
+**Symptom:** EXECUTE.BATCH hangs for a long time doing updates, and the update 
creates a core file.
+
+**Cause:** To be determined.
+
+**Solution:** Batch updates and ODBC row arrays do not currently work.
+
+## Random update statistics failures with HBase OutOfOrderScannerNextException
+
+**Defect:** [1391271](https://bugs.launchpad.net/trafodion/+bug/1391271)
+
+**Symptom:** While running update statistics commands, you see HBase 
<code>OutOfOrderScannerNextException</code> errors.
+
+**Cause:** The default <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values might be too low given 
the size of the tables. Sampling in update statistics is implemented using the 
HBase Random RowFilter. For very large tables with several billion rows, the 
sampling ratio required to get a sample of 1 million rows is very small. This 
can result in HBase client connection timeout errors since there may be no row 
returned by a RegionServer for an extended period of time.
+
+**Solution:** Increase the <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values. We have found that 
increasing those values to 600 seconds (10 minutes) might sometimes prevent 
many timeout-related errors. For more information, see the [HBase Configuration 
and Fine Tuning 
Recommendations](https://wiki.trafodion.org/wiki/index.php/Configuration#Recommendations).
+
+If increasing the <code>hbase.rpc.timeout</code> and 
<code>hbase.client.scanner.timeout.period</code> values does not work, try 
increasing the chosen sampling size. Choose a sampling percentage higher than 
the default setting of 1 million rows for large tables. For example, suppose 
table T has one billion rows. The following <code>UPDATE STATISTICS</code> 
statement will sample a million rows, or approximately one-tenth of one percent 
of the total rows:
+
+    update statistics for table T on every column sample;
+
+To sample one percent of the rows, regardless of the table size, you must 
explicitly state the sampling rate as follows:
+
+    update statistics for table T on every column sample random 1 percent;
+
+## Following update statistics, stats do not take effect immediately
+
+**Defect:** [1409937](https://bugs.launchpad.net/trafodion/+bug/1409937)
+
+**Symptom:** Immediately following an update statistics operation, the 
generated query plan does not seem to reflect the existence of statistics. For 
example, in a session, you create, and populate a table and then run update 
statistics on the table, prepare a query, and exit. A serial plan is generated 
and the estimated cardinality is 100 for both tables. In a new session, you 
prepare the same query, and a parallel plan is generated where the estimated 
cardinality reflects the statistics.
+
+**Cause:** This is a day-one issue.
+
+**Solution:** Retry the query after two minutes. Set <code>CQD 
HIST_NO_STATS_REFRESH_INTERVAL</code> to <code>'0'</code>. Run an <code>UPDATE 
STATISTICS</code> statement. Perform DML operations in a different session.
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/release.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release.md 
b/docs/src/site/markdown/release.md
new file mode 100644
index 0000000..8dad451
--- /dev/null
+++ b/docs/src/site/markdown/release.md
@@ -0,0 +1,225 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the 
+  License.
+-->
+This page describes how to create a Trafodion release. You have to be a 
Trafodion committer to use these instructions.
+
+# Prerequisites
+
+## Create PGP Key
+If you haven't done so already, then you need to create a PGP key so that you 
can sign the release. Please refer to: 
http://www.apache.org/dev/openpgp.html#generate-key.
+
+Please remember to store your private key is a secure place.
+
+**Example**
+
+    gpg --gen-key   (verify that sha1 is avoided (last on list – see above 
web site)
+    gpg -k  (shows public key)
+    gpg -K (shows private key)
+
+### Upload Public Key
+Upload your public key to a public key server. We recommend using 
http://pgp.mit.edu/keyserver.
+
+**Example**
+
+    gpg --send-keys <keyID> --keyserver pgp.mit.edu
+
+### Create Revocation Certificate
+Create a revocation certification using the instructions at: 
http://www.apache.org/dev/openpgp.html#revocation-certs.
+
+Please remember to store it in a secure place separate from your PGP keys.
+
+**Example**
+
+    gpg --output revoke-<keyD>.asc --armor --gen-revoke <keyID>
+
+# Add PGP to KEYS File
+Do the following:
+
+    svn co https://dist.apache.org/repos/dist/release/incubator/trafodion 
traf_release
+    cd traf_release 
+    gpg --list-sigs <keyID> >> KEYS
+    gpg  -armor –export <keyID>
+    svn commit –m “added new public key to KEYS file“
+
+# Prepare Artifacts
+## Prepare New Release
+
+1. Send a message out to the community indicating that a new release is being 
planned.  In this message, indicate what is planned for the release and when 
the release is scheduled.
+2. Give contributors enough time to assimilate this information so they can 
make plans to deliver their changes.  Recommend giving the community several 
weeks notice.
+3. Review open issues and planned features; determine what JIRA's should be 
included in the release.
+
+## Verify Release Requirements
+You need to ensure that:
+
+* A DISCLAIMER file exists in the top level directory containing correct 
information. Please refer to: 
http://incubator.apache.org/guides/branding.html#disclaimers.
+* NOTICE and LICENSE files exist in the top level directory which includes all 
third party licenses used in the product. Please refer to:  
http://www.apache.org/dev/licensing-howto.html.
+* A README file exists and is up to date in the top level directory describing 
the release.
+* The source release contains source code only, no binaries.
+* The provenance of all source files is clear.
+* All source files have Apache license headers, where possible.  Where not 
possible, then the exceptions are written up in the RAT_README file located in 
the top level directory.
+* RAT report is clean.
+* Copyright dates are current.
+* Build instructions are provided and can be run successfully.
+* Test instructions are provided and can be run successfully.
+
+## Create Release Branch
+Prior to releasing, send a message to the community indicating that a new 
release is imminent and that a new branch will be created to build the 
artifacts.
+
+After the new release branch is created, send another message to the community 
indicating that the branch is available and the deliveries will be monitored.  
Allow deliveries on the main branch to continue.
+
+Verify that all required changes have been delivered.
+
+## Create Artifacts
+Trafodion uses git as its repository.  When a new version is created, mark the 
repository with the tag to make sure it source tar can be recreated.
+
+### Create Tag
+
+**Example: Release x.x.x and release candidate 1 (rc1)**
+
+    git checkout -b tagx.x.x <release branch name>
+    git tag -a x.x.xrc1
+    git show x.x.xrc1
+    git push apache x.x.xrc1
+    git tag
+
+Once completed, a new source tar file exist in the distribution directory. 
+
+### Create Artifact Checksums and Signatures
+**Assumption**: You've already created the signing key and registered it at 
the http://pgp.mit.edu/public repository.
+
+    gpg --armor --output apache-trafodion-x.x.x-incubating-src.tar.gz.asc 
--detach-sig apache-trafodion-x.x.x-incubating-src.tar.gz
+    gpg --verify apache-trafodion-x.x.x-incubating-src.tar.gz.asc
+    md5sum apache-trafodion-x.x.x-incubating-src.tar.gz > 
apache-trafodion-x.x.x-incubating-src.tar.gz.md5
+    sha1sum apache-trafodion-x.x.x-incubating-src.tar.gz > 
apache-trafodion-x.x.x-incubating-src.tar.gz.sha 
+
+# Test Artifacts
+
+## Build and Test Source tar File
+Build and test the source tar file using the [Build Trafodion](build.html) 
instructions. You should perform this test on the following environments:
+
+* Test build on a fresh VM.
+* Test build using the tagged version from git
+
+## Compare Tagged Version with Source tar File
+Compare the code from the source tar file with the tagged version to make sure 
they match. The follow example assumes that the branch artifacts contains the 
release candidates.
+
+    mkdir traf_test
+    cd traf_test
+    cp <git dir>/incubator-trafodion/distribution/* .
+    tar zxf apache-trafodion-x.x.x-incubating-src.tar.gz
+
+Compare the two versions; for example, by using BCompare and the "Folder 
Compare Report" feature:
+
+    old: traf_test/incubator-trafodion 
+    new: <git dir>/incubator-trafodion
+
+**Note:**  The git version will have some additional git folders and the 
distribution directory.
+
+## Verify Apache Requirements
+Verify checksums and signatures using the [Verify 
Signature](#Verify_Signature) instructions below.
+
+Ensure that the high-level directory contains valid version of:
+
+* **```DISCLAIMER.txt```**
+* **```LICENSE.txt```**
+* **```NOTICE.txt```**
+* **```RAT_README.txt```**
+* **```README.txt```**
+
+# Stage Artifacts
+Once all the artifacts have been created and tested, then it's time to stage 
them.  Upload the artifacts to the 
https://dist.apache.org/repos/dist/dev/incubator/trafodion directory.
+
+1. Make sure **```svn```** exists. (It can be downloaded using **```yum```**.)
+    * **```which svn```**
+    * **```svn --version```** (version 1.6.11 works)
+2. Create a directory to store the **```svn```** repositoy
+3. Checkout source code. This creates a directory called incubator.
+    * **```svn co https://dist.apache.org/repos/dist/dev/incubator```**
+4. **```cd trafodion```**
+5. Create a new directory for the release: **```mkdir 
apache-trafodion-x.x.x-incubating```**
+6. **```cd <apache-trafodion-x.x.x-incubating>```**
+7. Copy the four files to the incubating directory.
+8. Ensure that you do an **```svn add```** for the new directory and all four 
files
+9. Ask for a review of the changes
+10. Commit your changes
+    * **```svn status```**
+    * **```svn commit –m "message…"```**
+    * Go to https://dist.apache.org/repos/dist/dev/incubator to see if your 
changes were committed
+
+# Verification
+All artifacts have been uploaded to the staging area.
+
+## Verify Signatures
+Download all the artifacts from the staging area including:
+
+    apache-trafodion-x.x.x-incubating-src.tar.gz
+    apache-trafodion-x.x.x-incubating-src.tar.gz.asc
+    apache-trafodion-x.x.x-incubating-src.tar.gz.md5
+    apache-trafodion-x.x.x-incubating-src.tar.gz.sha 
+
+Check signatures and checksums.
+
+**```apache-trafodion-x.x.x-incubating-src.tar.gz.asc```**
+
+    # View public key
+    gpg apache-trafodion-x.x.x-incubating-src.tar.gz.asc
+    
+    # Expect
+      gpg: Signature made Tue 03 Nov 2015 12:59:10 AM UTC using RSA key ID 
A44C5A05
+      gpg: Can't check signature: No public key
+
+    # Extract public key from key ID returned above
+    gpg --keyserver pgpkeys.mit.edu --recv-key A44C5A05
+
+    # Expect:
+      gpg: requesting key A44C5A05 from hkp server pgpkeys.mit.edu
+      gpg: /home/centos/.gnupg/trustdb.gpg: trustdb created
+      gpg: key A44C5A05: public key "Roberta Marton (CODE SIGNING KEY) 
<[email protected]>" imported
+    
+    # Verify signature
+    gpg --verify apache-trafodion-x.x.x-incubating-src.tar.gz.asc
+    # Expect:
+      gpg: Signature made <date> using RSA key ID A44C5A05
+      gpg: Good signature from "Roberta Marton (CODE SIGNING KEY) 
<[email protected]>"
+      gpg: WARNING: This key is not certified with a trusted signature!
+      gpg: There is no indication that the signature belongs to the owner.
+ 
+ **```apache-trafodion-x.x.x-incugating-src.tar.gz.md5```**
+ 
+     md5sum -c apache-trafodion-x.x.x-incubating-src.tar.gz.md5
+     
+     # Expect:
+       apache-trafodion-x.x.x-incubating-src.tar.gz: OK
+
+**```apache-trafodion-x.x.x-incubating-x.x.x-incubating-src.tar.gz.sha```**
+
+    sha1sum -c apache-trafodion-x.x.x-incubating-src.tar.gz.sha
+    
+    # Expect:
+      apache-trafodion-x.x.x-incubating-src.tar.gz: OK
+
+## Verify Apache Requirements
+Ensure that the high-level directory contains valid version of:
+
+* **```DISCLAIMER.txt```**
+* **```LICENSE.txt```**
+* **```NOTICE.txt```**
+* **```RAT_README.txt```**
+* **```README.txt```**
+
+Next, run **```rat```** to make sure all files have Apache copyrights.
+
+# Complete Release
+
+To be completed.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/roadmap.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/roadmap.md 
b/docs/src/site/markdown/roadmap.md
new file mode 100644
index 0000000..125a4c2
--- /dev/null
+++ b/docs/src/site/markdown/roadmap.md
@@ -0,0 +1,15 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the 
+  License.
+-->
+This page will provide information about future Trafodion releases and their 
planned content.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/setup-build-environment.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/setup-build-environment.md 
b/docs/src/site/markdown/setup-build-environment.md
new file mode 100644
index 0000000..4479397
--- /dev/null
+++ b/docs/src/site/markdown/setup-build-environment.md
@@ -0,0 +1,160 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the 
+  License.
+-->
+This page describes how you setup the Trafodion build environment.
+
+# Supported Platforms
+Red Hat or Centos 6.x (6.4 or later) versions are supported as development and 
production platforms.
+
+# Install Required Packages
+You need to install the following packages before you can build Trafodion.
+
+    sudo yum install epel-release
+ 
+    sudo yum install alsa-lib-devel ant ant-nodeps boost-devel cmake \
+             device-mapper-multipath dhcp flex gcc-c++ gd git glibc-devel \
+             glibc-devel.i686 graphviz-perl gzip java-1.7.0-openjdk-devel \
+             libX11-devel libXau-devel libaio-devel \
+             libcurl-devel libibcm.i686 libibumad-devel libibumad-devel.i686 \
+             libiodbc libiodbc-devel librdmacm-devel librdmacm-devel.i686 \
+             libxml2-devel log4cxx log4cxx-devel lua-devel lzo-minilzo \
+             net-snmp-devel net-snmp-perl openldap-clients openldap-devel \
+             openldap-devel.i686 openmotif openssl-devel openssl-devel.i686 \
+             openssl-static perl-Config-IniFiles perl-Config-Tiny \
+             perl-DBD-SQLite perl-Expect perl-IO-Tty perl-Math-Calc-Units \
+             perl-Params-Validate perl-Parse-RecDescent perl-TermReadKey \
+             perl-Time-HiRes protobuf-compiler protobuf-devel python-qpid \
+             python-qpid-qmf qpid-cpp-client \
+             qpid-cpp-client-ssl qpid-cpp-server qpid-cpp-server-ssl \
+             qpid-qmf qpid-tools readline-devel saslwrapper sqlite-devel \
+             unixODBC unixODBC-devel uuid-perl wget xerces-c-devel xinetd
+
+# Verify Java Version
+The Java version must be 1.7.x. Check as following:
+
+    $ java -version
+    java version "1.7.0_85"
+    OpenJDK Runtime Environment (rhel-2.6.1.3.el6_6-x86_64 u85-b01)
+    OpenJDK 64-Bit Server VM (build 24.85-b03, mixed mode)
+
+Ensure that the Java environment exists and points to your JDK installation. 
By default Java is located in **```/usr/lib/java-\<version\>```**.
+
+    $ echo $JAVA_HOME
+    $ export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk.x86_64
+
+# Download and Install Source
+The Trafodion source code contains tools that help you set up the build 
environment.
+## Git
+Please refer to [Making Changes](develop.html#making_changes) on the 
[Develop](develop.html) page.
+
+## tar file
+The source code for Apache Trafodion can be downloaded from [Apache Trafodion 
Incubator Release](https://dist.apache.org/repos/dist/release/incubator) as a 
tar file.  
+
+* Download the source tar file to your **```<trafodion download 
directory>```**.
+* Check the tar file validity by checking signatures, please refer to [Verify 
Signatures](release.html#Verify_Signatures). The Trafodion releases have been 
signed using The GNU Privacy Guard. 
+
+**Unpack the tar file**
+     
+     cd <trafodion download directory>
+     tar -xzf <tar file>
+
+# Install Build Tools
+Trafodion requires that several tools are installed in order to build. These 
tools are:
+
+Tool                                   | Description
+---------------------------------------|-----------------------------------------------------------------
+**Bison**                              | General-purpose parser generator.
+**ICU**                                | Setup of C/C++ and Java libraries 
providing Unicode and Globalization support for software applications.
+**LLVM**                               | Collection of modular and reusable 
compiler and tool-chain technologies.
+**Maven**                              | Build tool that is only installed if 
compatible version does not exist.
+**MPICH**                              | An implementation of the Message 
Passing Interface (MPI) standard.  For use in Trafodion, MPICH must be built to 
force sockets to be used in both internode and intranode message passing.
+**Thrift**                             | Communications and data serialization 
tool.
+**Udis86**                             | Minimalistic disassembler library 
(libudis86) for the x86 class of instruction set architectures.
+**Zookeeper**                          | Coordination service for distributed 
applications.  It exposes common services such as naming, configuration 
management, synchronization, and group services.
+
+You can perform the required installation using the Trafodion 
**```traf_tools_setup.sh```** script or by installing each tool manually.
+
+## ```traf_tools_setup.sh```
+**```traf_tools_setup.sh```** is a script that uses **```wget```** to download 
the appropriate tar file, build, and install the required tool into a directory 
of your choice for each tool required tools.  
+
+The advantage of this method is that all the correct tools are downloaded and 
built in a single directory.  Before building, a single environment variable 
needs to be set: **```TOOLSDIR```**.
+
+<div class="alert alert-dismissible alert-info">
+  <button type="button" class="close" data-dismiss="alert">&close;</button>
+  <p style="color:black"><strong>Note</strong></p>
+  <p style="color:black">You may want to modify 
<strong><code>traf_tools_setup.sh</code></strong> for your specific 
environment. Example: if you already have Zoopkeeper installed, you may not 
want to re-install it.</p>
+  <p style="color:black">You may need root or sudo access to installs the 
tools in desired locations.</p>
+  <p style="color:black">In the sections below, 
<strong><code>incubator-trafodion</code></strong> represents the root directory 
where you installed the Trafodion source.</p>
+</div>
+
+**Usage**
+
+    cd <Trafodion source directory>/install
+    ./traf_tools_setup.sh -h
+    Usage: ./traf_tools_setup.sh -d <downloaddir> -i <installdir>
+    -d <downloaddir> - location of download directory
+    -i <installdir>  - location of install directory
+    -h - help
+    example: traf_tools_setup.sh -d /home/userx/download -i /home/userx/tools
+
+Run **```traf_tools_setup.sh```** to install all dependent tools.
+
+**Example**
+
+    $ mkdir ~/download
+    $ ./traf_tools_setup.sh -d ~/download -i ~/tools
+    INFO: Starting tools build on Fri Nov  6 21:33:53 PST 2015
+    Tools install directory /home/centos/tools does not exist, do you want to 
to create it? y/n : y
+    INFO: Created directory /home/centos/tools
+    INFO: Tar download location: /home/centos/download
+    INFO: Tool install directory location: /home/centos/tools
+    INFO: LogFile location: 
/home/centos/incubator-trafodion/install/traf_tools_setup.log
+    ***********************************************************
+    INFO: Installing MPI on Fri Nov  6 21:34:00 PST 2015
+    INFO:   downloaded tar file: mpich-3.0.4.tar.gz
+    .
+    .
+    .
+    INFO:   downloaded tar file:  apache-maven-3.3.3-bin.tar.gz
+    INFO: Maven installation complete
+    ***********************************************************
+    INFO: Completed tools build on Fri Nov  6 22:23:22 PST 2015
+    INFO: List of tools directory:
+    apache-maven-3.3.3
+    bison_3_linux
+    dest-llvm-3.2
+    dest-mpich-3.0.4
+    icu4.4
+    thrift-0.9.0
+    udis86-1.7.2
+    zookeeper-3.4.5
+
+Export **```TOOLSDIR```** in **```.bashrc```** or **```.profile```**.
+
+    export TOOLSDIR=~/tools
+ 
+## Manual Installation
+Please refer to [Build Tools Manual Installation](build-tools-manual.html).
+
+# Verify Build Environment
+## Verify Maven
+Check that Maven is installed.
+
+    maven --version
+
+If Maven is not found, then you should add Maven to your **```PATH```** 
environmental variable in **```.bashrc```** or **```.profile```**.
+
+    PATH=$PATH:<tool installation directory>/apache-maven-3.3.3/bin
+
+At this point, your build environment has been set up. You should now be able 
to [Build Trafodion](build.html).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/testing.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/testing.md 
b/docs/src/site/markdown/testing.md
new file mode 100644
index 0000000..0cfee3e
--- /dev/null
+++ b/docs/src/site/markdown/testing.md
@@ -0,0 +1,179 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+This page describes the Trafodion test suites and their usage.
+
+# Component Tests
+Trafodion comes with several component-specific testing libraries.
+
+## SQL Core
+The SQL core components are written in a combination of C++ and Java. 
+
+You should ensure that the current set of regression tests pass each time you 
add or modify a SQL feature.
+
+If adding a new feature, then check that it is either covered by an existing 
regression test or add a new test to an existing test suite.
+
+### Test Suites
+**Location**: ```core/sql/regress```
+
+Directory              | Usage
+-----------------------|---------------------------------------------------------------------------
+**```catman1```**      | Tests the Catalog Manager.
+**```charsets```**     | Tests Character Sets.
+**```compGeneral```**  | Compiler test suite; tests optimizer-specific 
features.
+**```core```**         | Tests a subset/sample of all features from all the 
test suites.
+**```executor```**     | Tests the SQL Executor.
+**```fullstack2```**   | Similar to core but a very limited subset.
+**```hive```**         | Tests HDFS access to Hive tables.
+**```newregr```**      | Unused/Saved repository for some unpublished 
features. These are not run.
+**```qat```**          | Tests basic DDL and DML syntax.
+**```seabase```**      | Tests JNI interface to HBase.
+**```tools```**        | Regression driver scripts and general regression 
scripts.
+**```udr```**          | Tests the User Defined Routines (UDR) and TMUDF 
functionality.
+
+### Check Test Results
+On completion, the test run prints out a test summary. All tests should pass, 
or pass with known diffs.
+
+Test results are written to the **```runregr-sb.log```** file in each 
component's directory. Therefore, you can check the test results after the fact 
as follows:
+
+    cd $MY_SQROOT/rundir
+    grep FAIL */runregr-sb.log
+ 
+A successful test run shows no failures.
+
+### Run Full Test Suite
+This suite tests:
+
+* SQL Compiler
+* SQL Executor
+* Transactions
+* Foundation
+
+
+Do the following:
+
+    cd $MY_SQHOME
+    . ./sqenv.sh
+    cd $MY_SQROOT/../sql/regress
+    tools/runallsb
+
+### Run Individual Test Suites
+You can select individual test suites as follows:
+
+    cd $MY_SQHOME
+    . ./sqenv.sh
+    cd $MY_SQROOT/../sql/regress
+    tools/runallsb <suite1> <suite2>
+
+### Running an Individual Test
+#### If You've Already Run the Test Suite
+If you have already run the suite once, then you will have all your 
directories set up and you can run one test as follows:
+
+    cd $MY_SQROOT/../sql/regress/<suite>
+    # You can add the following two exports to .bashrc or .profile for 
convenience
+    export rundir=$MY_SQROOT/rundir
+    export scriptsdir=$MY_SQROOT/../sql/regress
+    # run the test
+    cd $rundir/<suite>
+    $scriptsdir/<suite>/runregr -sb <test>
+
+**Example**
+
+    cd $rundir/executor
+    $scriptsdir/executor/runregr -sb TEST130
+
+#### If You've Not Run the Test Suite
+If you have not run any regression suites so far, then you will not have the 
required sub directories set up. You manually create them for each suite you 
want to run.
+
+    cd $MY_SQROOT/../sql/regress/<suite>
+    # You can add the following two exports to .bashrc or .profile for 
convenience
+    export rundir=$MY_SQROOT/rundir
+    export scriptsdir=$MY_SQROOT/../sql/regress
+    mkdir $rundir
+    cd $rundir
+    # <suitename> should match the name of each directory in $scriptsdir
+    mkdir <suitename>
+    # run the test
+    cd $rundir/<suite>
+    $scriptsdir/<suite>/runregr -sb <test>
+
+### Detecting Failures
+If you see failures in any of your tests, you want to try running that suite 
or test individually as detailed above.
+ 
+Open up the DIFF file and correlate them to the LOG and EXPECTED files.
+ 
+* DIFF files are in **```$rundir/<suite name>```**.
+* LOG files are in **```$rundir/<suite name>```**.
+* EXPECTED files are in **```$scriptsdir/<suite name>```**.
+ 
+To narrow down the failure, open up the test file (for example: 
**```TEST130```**) in **```$scriptsdir/executor```**. 
+
+Recreate the problem with a smaller set of SQL commands and create a script to 
run from **```sqlci```**. If it's an issue that can be recreated only by 
running the whole suite, you can add a line to the test just before the command 
that fails to include a **```wait```** or a **```sleep```** **```sh sleep 
60```** will make the test pause and give you time to attach the 
**```sqlci```** process to the debugger. (You can find the PID of the 
**```sqlci```** process using **```sqps```** on the command line)
+ 
+Introducing a **```wait```** in the test will wait forever until you enter a 
character. This is another way to make the test pause to attach the debugger to 
the **```sqlci```** process.    
+
+### Modifying an Existing Test
+If you would like to add coverage for your new change, you can modify an 
existing test.
+
+Run the test after your modifications. If you are satisfied with your results, 
you need to modify the **```EXPECTED<test number>```** file to reflect your new 
change. The standard way to do it is to copy the **```LOG<test number>```** 
file to **```EXPECTED<test number>```** file.
+
+## Database Connectivity Services (DCS)
+The DCS test suite is organized per the Maven standard. 
+
+## JDBC T4
+The code is written in Java, and is built and unit tested using Maven. The 
test suite organization and use follow Maven standards.
+
+Instructions for setting up and running the test can be found in source tree 
at **```dcs/src/test/jdbc_test```**.
+
+## ODBC Tests
+The code is written for the Python 2.7 
[```unittest```](https://docs.python.org/2/library/unittest.html) framework. 
+
+It is run via the **```Testr```** and **```Tox```**. 
+
+    cd dcs/src/test/pytests
+    ./config.sh -d <host>t:<port> -t <Location of your Linux ODBC driver tar 
file>
+    tox -e py27
+
+Further instructions for setting up and running the test can be found in 
source tree at **```dcs/src/test/pytests```**.
+
+# Functional Tests
+
+## Phoenix
+The Phoenix tests provides basic functional tests for Trafodion. These tests 
were originally adapted from their counterpart at 
[salesforce.com](salesforce.com).
+
+The tests are executed using Maven with a Python wrapper. You can run them the 
same way on your own workstation instance just like the way Jenkins runs them. 
Do the following:
+
+<!-- This part is done in raw HTML because it's too complex to do this level 
of formatting in markdown. -->
+<ol>
+   <li>Prior to running Phoenix tests, you need to bring up your Trafodion 
instance and DCS. You need to configure at least 2-4 servers for DCS. The tests 
need at least two mxosrvrs as they make two connections at any given time. We 
recommend configuring DCS with four mxosrvrs since we have seen situations that 
mxosrvrs do not get released in time for the next connection if there are only 
two mxosrvrs.</li>
+  <li><p>Run the Phoenix tests from source tree</p>
+       <p style="text-indent=20px">
+          <pre>
+cd tests/phx
+phoenix_test.py --target=&lt;host&gt;:&lt;port&gt; --user=dontcare 
--pw=dontcare --targettype=TR --javahome=&lt;jdk&gt; 
--jdbccp=&lt;jdir&gt;/jdbcT4.jar</pre>
+          </p>
+       <p style="text-indent=20px">
+         <ul>
+           <li><strong>&lt;host&gt;</strong>: your workstation name or IP 
address.</li>
+           <li><strong>&lt;port&gt;</strong>: your DCS master port number.</li>
+           <li><strong>&lt;jdk&gt;</strong>:  the directory containing the 
jdk1.7.0_21_64 or later version of the JDK.</li>
+           <li><strong>&lt;jdir&gt;</strong>: the directory containing your 
JDBC T4 jar file. (export/lib if you downloaded a Trafodion binary 
package.)</li>
+         </ul>
+       </p>
+  </li>
+  <li><p>Analyze the results. The test results can be found in 
<strong><code>phoenix_test/target/surefire-reports</code></strong>. If there 
are any failures, they would come with file names and line numbers.</p>
+   <p>The source code can be found in 
<strong><code>phoenix_test/src/test/java/com/trafodion/phoenix/end2end</code></strong>.</p>
 
+   <p>These are JDBC tests written in java.</p>
+  </li>
+ </ol>
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/tests.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/tests.md b/docs/src/site/markdown/tests.md
new file mode 100644
index 0000000..ab9baf4
--- /dev/null
+++ b/docs/src/site/markdown/tests.md
@@ -0,0 +1,71 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+This page describes how to add or modify Trafodion tests and/or test suites. 
Please refer to the [Contribute](contribute.html) page for information about 
other ways to contribute to the Trafodion project.
+
+**Note**: The [Test](testing.html) page describes how the different Trafodion 
test libraries are organized and how you run different test. You should 
familiarize yourself with that page before modifying the Trafodion tests.
+
+# SQL Tests
+The SQL tests are located in: **```core/sql/regress```**. Please refer to the 
[Test](testing.html) page for information about each directory. Below, each of 
these directories is referred to as **```$scriptdir```**.
+
+The default output from **```core/sql/regress/tools/runallsb```** is located 
in **```$MY_SQROOT/rundir```**. This directory is referred to as 
**```$rundir```** below.
+
+Files associated with individual tests use the following naming convention: 
**```\<Type\>\<number\>```**. The files are organized as follows:
+
+Type       | Usage                              | Location
+-----------|------------------------------------|---------------------------------------------
+TEST       | The test itself.                   | **```$scriptdir/<test 
suite>```** 
+EXPECTED   | The expected output from the test. | **```$scriptdir/<test 
suite>```**
+FILTER     | Filters out variable results (for example, timestamps) from test 
results to ensure consistent runs. | **```$scriptdir/<test suite>```**
+LOG        | The output from running the test.  | **```$rundir/<test 
suite>```**
+DIFF       | Diff between LOG and EXPECTED.     | **```$rundir/<test 
suite>```**
+
+## Modify a Test
+The comments in a test provides information of what it does. Make your changes 
and then do the following:
+
+* Run the test.
+* Verify that the LOG output is as desired.
+* Copy the LOG output to EXPECTED.
+* Rerun the test and verify that the test passes.
+
+### Output with Variable Data
+If there are time stamps or generated names that may vary from run to run or 
from user to user, then you need to create a ```FILTER\<test number\>``` file. 
This will filter out the variable portions of the test results so the test 
results are consistent.
+ 
+Example filter file: **```core/sql/regress/core/FILTER024```**  
+
+**```core/sql/regress/tools```** contains generic filter files. These cover 
general/common variables in test output. You will need to add a new test 
specific filer if it’s specific to your new test output only. 
+
+### Check In Changes
+Check in the TEST and EXPECTED files in **```$scriptsdir```**.
+
+## Create New Test
+Creating a test is just a variation of [Modify a Test](#Modify_a_Test). The 
test should be associated with a test suite that covers the component you want 
to test. Please contact the [Trafodion Developer List](mail-lists.html) if you 
need help chosing the correct test suite.
+
+Once you've chosen the test suite and, therefore, the test source directory, 
you do the following:
+
+* Add the new test file to the test file in the selected test-suite directory.
+    * Use the naming convention found in the directory. (Normally: 
**```TEST\<nnn\>```**)
+    * Refer to **```core/sql/regress/runregr_\<test suite\>.ksh```** to verify 
the naming convention used.
+* The test DDL should use the schema name associated with the test suite.
+    * Refer to other test suites for examples.
+* Test and validate as described in [Modify a Test](#Modify_a_Test) above. 
+
+## Create New Test Suite
+The test suites cover different SQL components. Most components should be 
covered with the existing test suites.
+
+Do the following to create a new test suite:
+
+* Create a new directory with the suite name under **```core/sql/regress```**; 
for example: **```\<new test suite\>```**.
+* Refer to [Create New Test](#Create_New_Test) for instructions on how to add 
tests to the new test suite.
+* Add a test driver in **```core/sql/regress/tools```** directory with name 
**```runregr_\<new test suite\>.ksh```**. (Just copy and modify one of the 
other test drivers.)
+* Add the new test suite to **```core/sql/regress/runallsb/TEST_SUBDIRS```**.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/traf_authentication_config.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/traf_authentication_config.md 
b/docs/src/site/markdown/traf_authentication_config.md
new file mode 100644
index 0000000..2720428
--- /dev/null
+++ b/docs/src/site/markdown/traf_authentication_config.md
@@ -0,0 +1,96 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the 
+  License.
+-->
+This page describes the settings in the **```.traf_authentication_config```** 
file, which is the configuration file related to [Enabling Security Features in 
Trafodion](enable-secure-trafodion.html).
+
+# File Location
+By default the Trafodion authentication configuration file is located at 
**```$MY_SQROOT/sql/scripts/.traf_authentication_config```**. If you want to 
store the configuration file in a different location and/or use a different 
filename, then Trafodion supports environment variables to specify the 
alternate location/name.
+
+Trafodion firsts checks the environment variable 
**```TRAFAUTH_CONFIGFILE```**. If set, the value is used as the fully qualified 
Trafodion authentication configuration file.
+
+If the environment variable is not set, then Trafodion next checks the 
variable **```TRAFAUTH_CONFIGDIR```**. If set, the value is prepended to 
**```.traf_authentication_config```** and used as the Trafodion authentication 
file.
+
+If neither is set, Trafodion defaults to 
**```$MY_SQROOT/sql/scripts/.traf_authentication_config```**.
+
+# Template
+
+    # To use authentication in Trafodion, this file must be configured
+    # as described below and placed in $MY_SQROOT/sql/scripts and be named
+    # .traf_authentication_config.  You must also enable authentication by
+    # running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+    #
+    # NOTE: the format of this configuration file is expected to change in the 
+    # next release of Trafodion.  Backward compatibility is not guaranteed.
+    #
+    SECTION: Defaults
+      DefaultSectionName: local
+      RefreshTime: 1800
+      TLS_CACERTFilename:
+    SECTION: local 
+    # If one or more of the LDAPHostName values is a load balancing host, list
+    # the name(s) here, one name: value pair for each host.
+      LoadBalanceHostName: 
+
+    # One or more identically configured hosts must be specified here,  
+    # one name: value pair for each host.
+      LDAPHostName:
+    
+    # Default is port 389, change if using 636 or any other port
+      LDAPPort:389
+    
+    # Must specify one or more unique identifiers, one name: value pair for 
each
+      UniqueIdentifier:
+    
+    # If the configured LDAP server requires a username and password to 
+    # to perform name lookup, provide those here.  
+      LDAPSearchDN:
+      LDAPSearchPwd:
+     
+    # If configured LDAP server requires TLS(1) or SSL (2), update this value
+      LDAPSSL:0
+    
+    # Default timeout values in seconds
+      LDAPNetworkTimeout: 30 
+      LDAPTimeout: 30 
+      LDAPTimeLimit: 30
+     
+    # Default values for retry logic algorithm
+      RetryCount: 5 
+      RetryDelay: 2 
+      PreserveConnection: No
+      ExcludeBadHosts: Yes  
+      MaxExcludeListSize: 3
+
+# Configuration Attributes
+
+Attribute Name             | Purpose                             | Example 
Value             | Notes
+---------------------------|-------------------------------------|---------------------------|---------------------------------------
+**```LDAPHostName```**     | Host name of the local LDAP server. | 
**```ldap.master.com```** | If more than one **```LDAPHostName```** entry is 
provided, Trafodion will attempt to connect with each LDAP server before 
returning an authentication error. Also see the description related to 
**```RetryCount```** and **```RetryDelay```** entries.
+**```LDAPPort```**         | Port number of the local LDAP server. | 
**```345```** | Must be numeric value. Related to **```LDAPSSL```** entry. 
Standard port numbers for OpenLDAP are as follows: <ul><li>Non-secure: 
389</li><li>SSL: 636</li><li>TLS: 389</li></ul>
+**```LDAPSearchDN```** | If a search user is needed, the search user 
distinguished name is specified here. | **```cn=aaabbb, dc=demo, dc=net```** | 
If anonymous search is allowed on the local server, this attribute does not 
need to be specified or can be specified with no value (blank). To date, 
anonymous search is the normal approach used.
+**```LDAPSearchPWD```** | Password for the **```LDAPSearchDN```** value. See 
that entry for details. | **```welcome```** | None.
+**```LDAPSSL```** | A numeric value specifying whether the local LDAP server 
interface is unencrypted or TLS or SSL. Legal values are 0 for unencrypted, 1 
for SSL, and 2 for TLS. For SSL/TLS, see the section below on Encryption 
Support. | **```0```** | None.
+**```UniqueIdentifier```** | The directory attribute that contains the user's 
unique identifier. | **```uid=,ou=Users,dc=demo,
+dc=net```** | To account for the multiple forms of **```DN```** supported by a 
given LDAP server, specify the **```UniqueIdentifier```** parameter multiple 
times with different values. During a search, each **```UniqueIdentifier```** 
is tried in the order it is listed in the configuration file. 
+**```LDAPNetworkTimeout```** | Specifies the timeout (in seconds) after which 
the next **```LDAPHostName```** entry will be tried, in case of no response for 
a connection request. This parameter is similar to **```NETWORK_TIMEOUT```** in 
**```ldap_conf(5)```**. Default value is 30 seconds. | **```20```** | The value 
must be a positive number or -1. Setting this to -1 results in an infinite 
timeout.
+**```LDAPTimelimit```** | Specifies the time to wait when performing a search 
on the LDAP server for the user name. The number must be a positive integer. 
This parameter is similar to **```TIMELIMIT```** in **```ldap_conf(5)```**. 
Default value is 30 seconds. | **```15```** | The server may still apply a 
lower server-side limit on the duration of a search operation.
+**```LDAPTimeout```** | Specifies a timeout (in seconds) after which calls to 
synchronous LDAP APIs will abort if no response is received. This parameter is 
similar to **```TIMEOUT```** in **```ldap_conf(5)```**. Default value is 30 
seconds. | **```15```** | The value must be a positive number or -1. Setting 
this to -1 results in an infinite timeout.
+**```RetryCount```** | Number of attempts to establish a successful LDAP 
connection. Default is 5 retries before returning an error. | **```10```** | 
When a failed operation is retried, it will be attempted with each configured 
LDAP server, until the operation is successful or the number of configured 
retries is exceeded.
+**```RetryDelay```** | Specifies the number of seconds to delay between 
retries. Default value is 2 seconds. See description of **```RetryCount```**. | 
**```1```** | None.
+**```PreserveConnection```** | Specifies whether the connection to LDAP server 
will be maintained (YES) or closed (NO) once the operation finishes. Default 
value is NO. | **```YES```** | None.
+**```RefreshTime```** | Specifies the number of seconds that must have elapsed 
before the configuration file is reread. Default is 1800 (30 minutes). | 
**```3600```** | If set to zero, the configuration file is never read. The 
connectivity servers must be restarted for changes to take effect if this value 
is zero. This attribute is not specific to either configuration and must be 
defined in the DEFAULTS section.
+**```TLS_CACERTFilename```** | Specifies the location of the certificate file 
for the LDAP server(s). Filename can either be fully qualified or relative to 
**```$CACERTS_DIR```**. | **```cert.pem```** | This attribute applies to both 
configurations. If a configuration does not require a certificate, this 
attribute is ignored. This attribute must be defined in the DEFAULTS section.
+**```DefaultSectionName```** | Specifies the configuration type that will be 
assigned to a user by the **```REGISTER USER```** command if no authentication 
type is specified. In the initial Trafodion release, only one configuration is 
supported. | **```LOCAL```** | This attribute must be defined in the 
**```DEFAULTS```** section. If the **```DefaultSectionName```** attribute is 
specified, a section by that name (or equivalent) must be defined in 
**```.traf_ldapconfig```**. Legal values are **```LOCAL```** and 
**```ENTERPRISE```**. This syntax is likely to change.
+
+Return to [Enabling Security Features in 
Trafodion](enable-secure-trafodion.html).

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/markdown/wiki.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/wiki.md b/docs/src/site/markdown/wiki.md
new file mode 100644
index 0000000..e583e34
--- /dev/null
+++ b/docs/src/site/markdown/wiki.md
@@ -0,0 +1,23 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the 
+  License.
+-->
+This page describes how to change the Trafodion Wiki. Please refer to the 
[Contribute](contribute.html) page for information about other ways to 
contribute to the Trafodion project.
+
+# Getting Access
+
+We use a "white-listing" permissions scheme for editing the Wiki. We do this 
to prevent anonymous spammers from spamming the site.
+
+If you'd like to contribute to the wiki, just obtain a Confluence user ID on 
the Apache wiki, then send an e-mail to the [email protected] dlist 
requesting access (and providing your Confluence user ID name). 
+
+A friendly administrator will then grant you editing privileges.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/286a6e5c/docs/src/site/resources/images/multi-layer-esps.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/multi-layer-esps.png 
b/docs/src/site/resources/images/multi-layer-esps.png
new file mode 100644
index 0000000..6afa3a8
Binary files /dev/null and 
b/docs/src/site/resources/images/multi-layer-esps.png differ

Reply via email to