You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/06/12 01:18:26 UTC

svn commit: r1685002 [3/5] - in /phoenix: phoenix-docs/src/tools/org/h2/build/doc/ site/publish/ site/publish/language/ site/publish/presentations/ site/source/src/site/ site/source/src/site/markdown/ site/source/src/site/resources/presentations/

Modified: phoenix/site/publish/performance.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/performance.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/performance.html (original)
+++ phoenix/site/publish/performance.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -310,10 +310,7 @@
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -322,7 +319,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -333,49 +333,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/pherf.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/pherf.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/pherf.html (original)
+++ phoenix/site/publish/pherf.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="active"><a href="" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -390,10 +390,7 @@
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -402,7 +399,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -413,49 +413,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/phoenix_mr.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_mr.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_mr.html (original)
+++ phoenix/site/publish/phoenix_mr.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li class="active"><a href="" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -420,10 +420,7 @@ job.waitForCompletion(true);
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -432,7 +429,10 @@ job.waitForCompletion(true);
 							<a href="#" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -443,49 +443,49 @@ job.waitForCompletion(true);
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/phoenix_on_emr.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_on_emr.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_on_emr.html (original)
+++ phoenix/site/publish/phoenix_on_emr.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li class="active"><a href="" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="active"><a href="" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -288,11 +288,8 @@
 						<li >
 							<a href="http:divider" title=""></a>
 						</li>
-						<li class="active">
-							<a href="#" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
 						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -301,7 +298,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li class="active">
+							<a href="#" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -312,49 +312,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/phoenix_spark.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_spark.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_spark.html (original)
+++ phoenix/site/publish/phoenix_spark.html Thu Jun 11 23:18:24 2015
@@ -1,14 +1,14 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
 
 	<head>
 		<meta charset="UTF-8" />
-		<title>Apache Spark Integration | Apache Phoenix</title>
+		<title>Apache Spark Plugin | Apache Phoenix</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<meta name="description" content="" />
 		<meta http-equiv="content-language" content="en" />
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="active"><a href="" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li class="active"><a href="" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -139,30 +139,49 @@
 		<div class="span12">
 			<div class="body-content">
 <div class="page-header">
- <h1>Apache Spark Integration</h1>
+ <h1>Apache Spark Plugin</h1>
 </div> 
-<p>phoenix-spark extends Phoenix’s MapReduce support to allow Spark to load Phoenix tables as RDDs or DataFrames and enables persisting RDDs of Tuples back to Phoenix.</p> 
+<p>The phoenix-spark plugin extends Phoenix’s MapReduce support to allow Spark to load Phoenix tables as RDDs or DataFrames, and enables persisting them back to Phoenix.</p> 
 <div class="section"> 
- <h2 id="Prerequisites">Prerequisites</h2> 
- <div class="source"> 
-  <pre>Phoenix v4.4.0 and above
-Spark 1.3.0
+ <div class="section"> 
+  <div class="section"> 
+   <h4 id="Prerequisites">Prerequisites</h4> 
+   <ul> 
+    <li>Phoenix 4.4.0-SNAPSHOT +</li> 
+    <li>Spark 1.3.0 +</li> 
+   </ul> 
+  </div> 
+  <div class="section"> 
+   <h4 id="Spark_setup">Spark setup</h4> 
+   <ol style="list-style-type: decimal"> 
+    <li>Ensure that all requisite Phoenix / HBase platform dependencies are available on the classpath for the Spark executors and drivers</li> 
+    <li>One method is to add the phoenix-4.4.0-SNAPSHOT-client.jar to ‘SPARK_CLASSPATH’ in spark-env.sh, or setting both ‘spark.executor.extraClassPath’ and ‘spark.driver.extraClassPath’ in spark-defaults.conf</li> 
+    <li>To help your IDE, you may want to add the following ‘provided’ dependency:</li> 
+   </ol> 
+   <div class="source"> 
+    <pre>&lt;dependency&gt;
+  &lt;groupId&gt;org.apache.phoenix&lt;/groupId&gt;
+  &lt;artifactId&gt;phoenix-spark&lt;/artifactId&gt;
+  &lt;version&gt;${phoenix.version}&lt;/version&gt;
+  &lt;scope&gt;provided&lt;/scope&gt;
+&lt;/dependency&gt;
 </pre> 
+   </div> 
+  </div> 
  </div> 
-</div> 
-<div class="section"> 
- <h2 id="Reading_Phoenix_Tables">Reading Phoenix Tables</h2> 
- <p>Given a Phoenix table with the following DDL</p> 
- <div class="source"> 
-  <pre>CREATE TABLE TABLE1 (ID BIGINT NOT NULL PRIMARY KEY, COL1 VARCHAR);
+ <div class="section"> 
+  <h3 id="Reading_Phoenix_Tables">Reading Phoenix Tables</h3> 
+  <p>Given a Phoenix table with the following DDL</p> 
+  <div class="source"> 
+   <pre>CREATE TABLE TABLE1 (ID BIGINT NOT NULL PRIMARY KEY, COL1 VARCHAR);
 UPSERT INTO TABLE1 (ID, COL1) VALUES (1, 'test_row_1');
 UPSERT INTO TABLE1 (ID, COL1) VALUES (2, 'test_row_2');
 </pre> 
- </div> 
- <div class="section"> 
-  <h3 id="Load_as_a_DataFrame_using_the_Data_Source_API">Load as a DataFrame using the Data Source API</h3> 
-  <div class="source"> 
-   <pre>import org.apache.spark.SparkContext
+  </div> 
+  <div class="section"> 
+   <h4 id="Load_as_a_DataFrame_using_the_Data_Source_API">Load as a DataFrame using the Data Source API</h4> 
+   <div class="source"> 
+    <pre>import org.apache.spark.SparkContext
 import org.apache.spark.sql.SQLContext
 import org.apache.phoenix.spark._
 
@@ -179,12 +198,12 @@ df
   .select(df(&quot;ID&quot;))
   .show
 </pre> 
+   </div> 
   </div> 
- </div> 
- <div class="section"> 
-  <h3 id="Load_as_a_DataFrame_directly_using_a_Configuration_object">Load as a DataFrame directly using a Configuration object</h3> 
-  <div class="source"> 
-   <pre>import org.apache.hadoop.conf.Configuration
+  <div class="section"> 
+   <h4 id="Load_as_a_DataFrame_directly_using_a_Configuration_object">Load as a DataFrame directly using a Configuration object</h4> 
+   <div class="source"> 
+    <pre>import org.apache.hadoop.conf.Configuration
 import org.apache.spark.SparkContext
 import org.apache.spark.sql.SQLContext
 import org.apache.phoenix.spark._
@@ -202,12 +221,12 @@ val df = sqlContext.phoenixTableAsDataFr
 
 df.show
 </pre> 
+   </div> 
   </div> 
- </div> 
- <div class="section"> 
-  <h3 id="Load_as_an_RDD_using_a_Zookeeper_URL">Load as an RDD, using a Zookeeper URL</h3> 
-  <div class="source"> 
-   <pre>import org.apache.spark.SparkContext
+  <div class="section"> 
+   <h4 id="Load_as_an_RDD_using_a_Zookeeper_URL">Load as an RDD, using a Zookeeper URL</h4> 
+   <div class="source"> 
+    <pre>import org.apache.spark.SparkContext
 import org.apache.spark.sql.SQLContext
 import org.apache.phoenix.spark._
 
@@ -223,19 +242,21 @@ rdd.count()
 val firstId = rdd1.first()(&quot;ID&quot;).asInstanceOf[Long]
 val firstCol = rdd1.first()(&quot;COL1&quot;).asInstanceOf[String]
 </pre> 
+   </div> 
   </div> 
  </div> 
-</div> 
-<div class="section"> 
- <h2 id="Saving_RDDs_to_Phoenix">Saving RDDs to Phoenix</h2> 
- <p><tt>saveToPhoenix</tt> is an implicit method on RDD[Product], or an RDD of Tuples. The data types must correspond to the Java types Phoenix supports (<a class="externalLink" href="http://phoenix.apache.org/language/datatypes.html">http://phoenix.apache.org/language/datatypes.html</a>)</p> 
- <p>Given a Phoenix table with the following DDL</p> 
- <div class="source"> 
-  <pre>CREATE TABLE OUTPUT_TEST_TABLE (id BIGINT NOT NULL PRIMARY KEY, col1 VARCHAR, col2 INTEGER);
+ <div class="section"> 
+  <h3 id="Saving_Phoenix">Saving Phoenix</h3> 
+  <p>Given a Phoenix table with the following DDL</p> 
+  <div class="source"> 
+   <pre>CREATE TABLE OUTPUT_TEST_TABLE (id BIGINT NOT NULL PRIMARY KEY, col1 VARCHAR, col2 INTEGER);
 </pre> 
- </div> 
- <div class="source"> 
-  <pre>import org.apache.spark.SparkContext
+  </div> 
+  <div class="section"> 
+   <h4 id="Saving_RDDs">Saving RDDs</h4> 
+   <p>The <tt>saveToPhoenix</tt> method is an implicit method on RDD[Product], or an RDD of Tuples. The data types must correspond to one of <a href="language/datatypes.html">the Java types supported by Phoenix</a>.</p> 
+   <div class="source"> 
+    <pre>import org.apache.spark.SparkContext
 import org.apache.phoenix.spark._
 
 val sc = new SparkContext(&quot;local&quot;, &quot;phoenix-test&quot;)
@@ -249,20 +270,20 @@ sc
     zkUrl = Some(&quot;phoenix-server:2181&quot;)
   )
 </pre> 
- </div> 
-</div> 
-<div class="section"> 
- <h2 id="Saving_DataFrames_to_Phoenix">Saving DataFrames to Phoenix</h2> 
- <p>The <tt>save</tt> is method on DataFrame allows passing in a data source type. You can use <tt>org.apache.phoenix.spark</tt>, and must also pass in a <tt>table</tt> and <tt>zkUrl</tt> parameter to specify which table and server to persist the DataFrame to. The column names are derived from the DataFrame’s schema field names, and must match the Phoenix column names.</p> 
- <p>The <tt>save</tt> method also takes a <tt>SaveMode</tt> option, for which only <tt>SaveMode.Overwrite</tt> is supported.</p> 
- <p>Given two Phoenix tables with the following DDL:</p> 
- <div class="source"> 
-  <pre>CREATE TABLE INPUT_TABLE (id BIGINT NOT NULL PRIMARY KEY, col1 VARCHAR, col2 INTEGER);
+   </div> 
+  </div> 
+  <div class="section"> 
+   <h4 id="Saving_DataFrames">Saving DataFrames</h4> 
+   <p>The <tt>save</tt> is method on DataFrame allows passing in a data source type. You can use <tt>org.apache.phoenix.spark</tt>, and must also pass in a <tt>table</tt> and <tt>zkUrl</tt> parameter to specify which table and server to persist the DataFrame to. The column names are derived from the DataFrame’s schema field names, and must match the Phoenix column names.</p> 
+   <p>The <tt>save</tt> method also takes a <tt>SaveMode</tt> option, for which only <tt>SaveMode.Overwrite</tt> is supported.</p> 
+   <p>Given two Phoenix tables with the following DDL:</p> 
+   <div class="source"> 
+    <pre>CREATE TABLE INPUT_TABLE (id BIGINT NOT NULL PRIMARY KEY, col1 VARCHAR, col2 INTEGER);
 CREATE TABLE OUTPUT_TABLE (id BIGINT NOT NULL PRIMARY KEY, col1 VARCHAR, col2 INTEGER);
 </pre> 
- </div> 
- <div class="source"> 
-  <pre>import org.apache.spark.SparkContext
+   </div> 
+   <div class="source"> 
+    <pre>import org.apache.spark.SparkContext
 import org.apache.spark.sql.SQLContext
 import org.apache.phoenix.spark._
 
@@ -276,20 +297,22 @@ val df = sqlContext.load(&quot;org.apach
 df.save(&quot;org.apache.phoenix.spark&quot;, SaveMode.Overwrite, Map(&quot;table&quot; -&gt; &quot;OUTPUT_TABLE&quot;, 
   &quot;zkUrl&quot; -&gt; hbaseConnectionString))
 </pre> 
+   </div> 
+  </div> 
+ </div> 
+ <div class="section"> 
+  <h3 id="Notes">Notes</h3> 
+  <p>The functions <tt>phoenixTableAsDataFrame</tt>, <tt>phoenixTableAsRDD</tt> and <tt>saveToPhoenix</tt> all support optionally specifying a <tt>conf</tt> Hadoop configuration parameter with custom Phoenix client settings, as well as an optional <tt>zkUrl</tt> parameter for the Phoenix connection URL.</p> 
+  <p>If <tt>zkUrl</tt> isn’t specified, it’s assumed that the “hbase.zookeeper.quorum” property has been set in the <tt>conf</tt> parameter. Similarly, if no configuration is passed in, <tt>zkUrl</tt> must be specified.</p> 
+ </div> 
+ <div class="section"> 
+  <h3 id="Limitations">Limitations</h3> 
+  <ul> 
+   <li>Basic support for column and predicate pushdown using the Data Source API</li> 
+   <li>The Data Source API does not support passing custom Phoenix settings in configuration, you must create the DataFrame or RDD directly if you need fine-grained configuration.</li> 
+   <li>No support for aggregate or distinct queries as explained in our <a href="phoenix_mr.html">Map Reduce Integration</a> documentation.</li> 
+  </ul> 
  </div> 
-</div> 
-<div class="section"> 
- <h2 id="Notes">Notes</h2> 
- <p>The functions <tt>phoenixTableAsDataFrame</tt>, <tt>phoenixTableAsRDD</tt> and <tt>saveToPhoenix</tt> all support optionally specifying a <tt>conf</tt> Hadoop configuration parameter with custom Phoenix client settings, as well as an optional <tt>zkUrl</tt> parameter for the Phoenix connection URL.</p> 
- <p>If <tt>zkUrl</tt> isn’t specified, it’s assumed that the “hbase.zookeeper.quorum” property has been set in the <tt>conf</tt> parameter. Similarly, if no configuration is passed in, <tt>zkUrl</tt> must be specified.</p> 
-</div> 
-<div class="section"> 
- <h2 id="Limitations">Limitations</h2> 
- <ul> 
-  <li>Basic support for column and predicate pushdown using the Data Source API</li> 
-  <li>The Data Source API does not support passing custom Phoenix settings in configuration, you must create the DataFrame or RDD directly if you need fine-grained configuration.</li> 
-  <li>No support for aggregate or distinct functions (<a class="externalLink" href="http://phoenix.apache.org/phoenix_mr.html">http://phoenix.apache.org/phoenix_mr.html</a>)</li> 
- </ul> 
 </div>
 			</div>
 		</div>
@@ -398,11 +421,8 @@ df.save(&quot;org.apache.phoenix.spark&q
 						<li >
 							<a href="http:divider" title=""></a>
 						</li>
-						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						<li class="active">
+							<a href="#" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -410,8 +430,11 @@ df.save(&quot;org.apache.phoenix.spark&q
 						<li >
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
-						<li class="active">
-							<a href="#" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+						<li >
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -422,49 +445,49 @@ df.save(&quot;org.apache.phoenix.spark&q
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/pig_integration.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/pig_integration.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/pig_integration.html (original)
+++ phoenix/site/publish/pig_integration.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li class="active"><a href="" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -319,10 +319,7 @@ DUMP cnt;
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li class="active">
 							<a href="#" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -331,7 +328,10 @@ DUMP cnt;
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -342,49 +342,49 @@ DUMP cnt;
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Added: phoenix/site/publish/presentations/HBaseCon2015-final.pptx
URL: http://svn.apache.org/viewvc/phoenix/site/publish/presentations/HBaseCon2015-final.pptx?rev=1685002&view=auto
==============================================================================
Binary file - no diff available.

Propchange: phoenix/site/publish/presentations/HBaseCon2015-final.pptx
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: phoenix/site/publish/recent.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/recent.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/recent.html (original)
+++ phoenix/site/publish/recent.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -281,10 +281,7 @@
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -293,7 +290,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -304,49 +304,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/release.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/release.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/release.html (original)
+++ phoenix/site/publish/release.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -276,10 +276,7 @@
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -288,7 +285,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -299,49 +299,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/resources.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/resources.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/resources.html (original)
+++ phoenix/site/publish/resources.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -296,10 +296,7 @@
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -308,7 +305,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -319,49 +319,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/roadmap.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/roadmap.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/roadmap.html (original)
+++ phoenix/site/publish/roadmap.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
-									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
-									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
-									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
-									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -281,10 +281,7 @@
 							<a href="http:divider" title=""></a>
 						</li>
 						<li >
-							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
-						</li>
-						<li >
-							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -293,7 +290,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -304,49 +304,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>