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 2016/06/09 23:04:43 UTC

svn commit: r1747604 [2/2] - in /phoenix/site: publish/ publish/images/ publish/language/ source/src/site/ source/src/site/markdown/ source/src/site/resources/images/

Added: phoenix/site/publish/phoenix_python.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_python.html?rev=1747604&view=auto
==============================================================================
--- phoenix/site/publish/phoenix_python.html (added)
+++ phoenix/site/publish/phoenix_python.html Thu Jun  9 23:04:42 2016
@@ -0,0 +1,400 @@
+
+<!DOCTYPE html>
+<!--
+ Generated by Apache Maven Doxia at 2016-06-09
+ 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>Phoenix Adapter for Python | 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" />
+
+		<link href="//netdna.bootstrapcdn.com/bootswatch/2.3.2/flatly/bootstrap.min.css" rel="stylesheet" />
+		<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet" />
+		<link href="./css/bootswatch.css" rel="stylesheet" />
+		<link href="./css/reflow-skin.css" rel="stylesheet" />
+
+		<link href="//yandex.st/highlightjs/7.5/styles/default.min.css" rel="stylesheet" />
+		
+		<link href="./css/lightbox.css" rel="stylesheet" />
+		
+		<link href="./css/site.css" rel="stylesheet" />
+		<link href="./css/print.css" rel="stylesheet" media="print" />
+		
+		<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+		<!--[if lt IE 9]>
+			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+		<![endif]-->
+
+
+
+	</head>
+
+	<body class="page-phoenix_python project-phoenix-site" data-spy="scroll" data-offset="60" data-target="#toc-scroll-target">
+
+		<div class="navbar navbar-fixed-top">
+			<div class="navbar-inner">
+				<div class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#top-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<a class="brand" href="index.html"><div class="xtoplogo"></div></a>
+					<div class="nav-collapse collapse" id="top-nav-collapse">
+						<ul class="nav pull-right">
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="index.html" title="Overview">Overview</a></li>
+									<li ><a href="who_is_using.html" title="Who is Using">Who is Using</a></li>
+									<li ><a href="recent.html" title="New Features">New Features</a></li>
+									<li ><a href="roadmap.html" title="Roadmap">Roadmap</a></li>
+									<li ><a href="performance.html" title="Performance">Performance</a></li>
+									<li ><a href="team.html" title="Team">Team</a></li>
+									<li ><a href="resources.html" title="Presentations">Presentations</a></li>
+									<li ><a href="mailing_list.html" title="Mailing Lists">Mailing Lists</a></li>
+									<li ><a href="source.html" title="Source Repository">Source Repository</a></li>
+									<li ><a href="issues.html" title="Issue Tracking">Issue Tracking</a></li>
+									<li ><a href="download.html" title="Download">Download</a></li>
+									<li ><a href="installation.html" title="Installation">Installation</a></li>
+									<li class="divider"/>
+									<li ><a href="contributing.html" title="How to Contribute">How to Contribute</a></li>
+									<li ><a href="develop.html" title="How to Develop">How to Develop</a></li>
+									<li ><a href="building_website.html" title="How to Update Website">How to Update Website</a></li>
+									<li ><a href="release.html" title="How to Release">How to Release</a></li>
+									<li class="divider"/>
+									<li ><a href="http://www.apache.org/licenses/" title="License" class="externalLink">License</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Using <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
+									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
+									<li ><a href="building.html" title="Building">Building</a></li>
+									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
+									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
+									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
+									<li class="divider"/>
+									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li class="active"><a href="" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</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="transactions.html" title="Transactions">Transactions</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li class="divider"/>
+									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
+									<li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
+									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
+									<li class="divider"/>
+									<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="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
+									<li class="divider"/>
+									<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="metrics.html" title="Metrics">Metrics</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Reference <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="language/index.html" title="Grammar">Grammar</a></li>
+									<li ><a href="language/functions.html" title="Functions">Functions</a></li>
+									<li ><a href="language/datatypes.html" title="Datatypes">Datatypes</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li class="divider"/>
+									<li ><a href="paged.html" title="Row Value Constructors">Row Value Constructors</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="joins.html" title="Joins">Joins</a></li>
+									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
+								</ul>
+							</li>
+						</ul>
+					</div><!--/.nav-collapse -->
+				</div>
+			</div>
+		</div>
+		
+	<div class="container">
+	
+	<!-- Masthead
+	================================================== -->
+
+	<header>
+	</header>
+
+	<div class="main-body">
+	<div class="row">
+		<div class="span12">
+			<div class="body-content">
+<div class="page-header">
+ <h1>Phoenix Adapter for Python</h1>
+</div> 
+<p>A Phoenix adapter is available for Python courtesy of Luk&aacute;š Lalinsk&yacute;. For an overview, see <a class="externalLink" href="https://oxygene.sk/2015/07/phoenix-database-adapter-for-python/">here</a> and for detailed documentation, see <a class="externalLink" href="https://pythonhosted.org/phoenixdb/">here</a>.</p> 
+<p>If you’d like this to become part of our Apache Phoenix distro, please let Luk&aacute;š and us know.</p>
+			</div>
+		</div>
+	</div>
+	</div>
+
+	</div><!-- /container -->
+	
+	<!-- Footer
+	================================================== -->
+	<footer class="well">
+		<div class="container">
+			<div class="row">
+				<div class="span2 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">About</li>
+						<li >
+							<a href="index.html" title="Overview">Overview</a>
+						</li>
+						<li >
+							<a href="who_is_using.html" title="Who is Using">Who is Using</a>
+						</li>
+						<li >
+							<a href="recent.html" title="New Features">New Features</a>
+						</li>
+						<li >
+							<a href="roadmap.html" title="Roadmap">Roadmap</a>
+						</li>
+						<li >
+							<a href="performance.html" title="Performance">Performance</a>
+						</li>
+						<li >
+							<a href="team.html" title="Team">Team</a>
+						</li>
+						<li >
+							<a href="resources.html" title="Presentations">Presentations</a>
+						</li>
+						<li >
+							<a href="mailing_list.html" title="Mailing Lists">Mailing Lists</a>
+						</li>
+						<li >
+							<a href="source.html" title="Source Repository">Source Repository</a>
+						</li>
+						<li >
+							<a href="issues.html" title="Issue Tracking">Issue Tracking</a>
+						</li>
+						<li >
+							<a href="download.html" title="Download">Download</a>
+						</li>
+						<li >
+							<a href="installation.html" title="Installation">Installation</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="contributing.html" title="How to Contribute">How to Contribute</a>
+						</li>
+						<li >
+							<a href="develop.html" title="How to Develop">How to Develop</a>
+						</li>
+						<li >
+							<a href="building_website.html" title="How to Update Website">How to Update Website</a>
+						</li>
+						<li >
+							<a href="release.html" title="How to Release">How to Release</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="http://www.apache.org/licenses/" title="License" class="externalLink">License</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span2 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Using</li>
+						<li >
+							<a href="faq.html" title="F.A.Q.">F.A.Q.</a>
+						</li>
+						<li >
+							<a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a>
+						</li>
+						<li >
+							<a href="building.html" title="Building">Building</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>
+						</li>
+						<li >
+							<a href="release_notes.html" title="Release Notes">Release Notes</a>
+						</li>
+						<li >
+							<a href="pherf.html" title="Performance Testing">Performance Testing</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li class="active">
+							<a href="#" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span2 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Features</li>
+						<li >
+							<a href="transactions.html" title="Transactions">Transactions</a>
+						</li>
+						<li >
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
+						</li>
+						<li >
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+						</li>
+						<li >
+							<a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a>
+						</li>
+						<li >
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+						</li>
+						<li >
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></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="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></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="metrics.html" title="Metrics">Metrics</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Reference</li>
+						<li >
+							<a href="language/index.html" title="Grammar">Grammar</a>
+						</li>
+						<li >
+							<a href="language/functions.html" title="Functions">Functions</a>
+						</li>
+						<li >
+							<a href="language/datatypes.html" title="Datatypes">Datatypes</a>
+						</li>
+						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="paged.html" title="Row Value Constructors">Row Value Constructors</a>
+						</li>
+						<li >
+							<a href="sequences.html" title="Sequences">Sequences</a>
+						</li>
+						<li >
+							<a href="joins.html" title="Joins">Joins</a>
+						</li>
+						<li >
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-description">
+					<form action="http://search-hadoop.com/?" method="get"><input value="Phoenix" name="fc_project" type="hidden"><input placeholder="Search Phoenix&hellip;" required="required" style="width:170px;" size="18" name="q" id="query" type="search"></form>
+				</div>
+			</div>
+		</div>
+	</footer>
+		
+	<div class="container subfooter">
+		<div class="row">
+			<div class="span12">
+				<p class="pull-right"><a href="#">Back to top</a></p>
+				<p class="copyright">Copyright &copy;2016 <a href="http://www.apache.org">Apache Software Foundation</a>. All Rights Reserved.</p>
+			</div>
+		</div>
+	</div>
+
+	<!-- Le javascript
+	================================================== -->
+	<!-- Placed at the end of the document so the pages load faster -->
+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+	
+	<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+	<script src="./js/lightbox.js"></script>
+	<script src="./js/jquery.smooth-scroll.min.js"></script>
+	<!-- back button support for smooth scroll -->
+	<script src="./js/jquery.ba-bbq.min.js"></script>
+	<script src="//yandex.st/highlightjs/7.5/highlight.min.js"></script>
+
+	<script src="./js/reflow-skin.js"></script>
+	
+	</body>
+</html>

Modified: phoenix/site/publish/phoenix_spark.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_spark.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_spark.html (original)
+++ phoenix/site/publish/phoenix_spark.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -511,6 +515,18 @@ pr.vertices.saveToPhoenix(&quot;EMAIL_EN
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/pig_integration.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/pig_integration.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/pig_integration.html (original)
+++ phoenix/site/publish/pig_integration.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -328,6 +332,18 @@ DUMP cnt;
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/recent.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/recent.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/recent.html (original)
+++ phoenix/site/publish/recent.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -294,6 +298,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/release.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/release.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/release.html (original)
+++ phoenix/site/publish/release.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -285,6 +289,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/release_notes.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/release_notes.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/release_notes.html (original)
+++ phoenix/site/publish/release_notes.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -292,6 +296,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/resources.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/resources.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/resources.html (original)
+++ phoenix/site/publish/resources.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -349,6 +353,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/roadmap.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/roadmap.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/roadmap.html (original)
+++ phoenix/site/publish/roadmap.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -287,6 +291,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/rowtimestamp.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/rowtimestamp.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/rowtimestamp.html (original)
+++ phoenix/site/publish/rowtimestamp.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -274,6 +278,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/salted.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/salted.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/salted.html (original)
+++ phoenix/site/publish/salted.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -282,6 +286,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/secondary_indexing.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/secondary_indexing.html (original)
+++ phoenix/site/publish/secondary_indexing.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-05-06
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -563,6 +567,18 @@ CREATE LOCAL INDEX my_index ON my_table
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/sequences.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/sequences.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/sequences.html (original)
+++ phoenix/site/publish/sequences.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -313,6 +317,18 @@ VALUES( NEXT VALUE FOR my_schema.my_sequ
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/server.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/server.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/server.html (original)
+++ phoenix/site/publish/server.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -482,6 +486,18 @@ log4j.logger.org.eclipse.jetty.server=IN
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/skip_scan.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/skip_scan.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/skip_scan.html (original)
+++ phoenix/site/publish/skip_scan.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -271,6 +275,18 @@ AND KEY2 IN (1, 2)
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/source.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/source.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/source.html (original)
+++ phoenix/site/publish/source.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -277,6 +281,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/subqueries.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/subqueries.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/subqueries.html (original)
+++ phoenix/site/publish/subqueries.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -415,6 +419,18 @@ ORDER BY count(*) DESC;
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/team.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/team.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/team.html (original)
+++ phoenix/site/publish/team.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-05-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -440,6 +444,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/tracing.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/tracing.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/tracing.html (original)
+++ phoenix/site/publish/tracing.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -453,6 +457,18 @@ Connection conn = DriverManager.getConne
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/transactions.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/transactions.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/transactions.html (original)
+++ phoenix/site/publish/transactions.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -350,6 +354,18 @@ DELETE FROM my_other_table WHERE k=2;
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/tuning.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/tuning.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/tuning.html (original)
+++ phoenix/site/publish/tuning.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -519,6 +523,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/udf.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/udf.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/udf.html (original)
+++ phoenix/site/publish/udf.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -403,6 +407,18 @@ Connection conn = DriverManager.getConne
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/update_statistics.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/update_statistics.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/update_statistics.html (original)
+++ phoenix/site/publish/update_statistics.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -319,6 +323,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/upgrading.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/upgrading.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/upgrading.html (original)
+++ phoenix/site/publish/upgrading.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -285,6 +289,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/views.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/views.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/views.html (original)
+++ phoenix/site/publish/views.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-18
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -315,6 +319,18 @@ VALUES('John Doe', CURRENT_DATE(), NEXT
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/publish/who_is_using.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/who_is_using.html?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/publish/who_is_using.html (original)
+++ phoenix/site/publish/who_is_using.html Thu Jun  9 23:04:42 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-04-28
+ Generated by Apache Maven Doxia at 2016-06-09
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -86,6 +86,10 @@
 									<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="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li class="divider"/>
+									<li ><a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a></li>
+									<li ><a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a></li>
+									<li ><a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -357,6 +361,18 @@
 						<li >
 							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
 						</li>
+						<li >
+							<a href="http:divider" title=""></a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Phoenix on Amazon EMR">Phoenix on Amazon EMR</a>
+						</li>
+						<li >
+							<a href="phoenix_python.html" title="Phoenix Adapter for Python">Phoenix Adapter for Python</a>
+						</li>
+						<li >
+							<a href="phoenix_orm.html" title="Phoenix ORM Library">Phoenix ORM Library</a>
+						</li>
 					</ul>
 				</div>
 				<div class="span2 bottom-nav">

Modified: phoenix/site/source/src/site/markdown/index.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/index.md?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/index.md (original)
+++ phoenix/site/source/src/site/markdown/index.md Thu Jun  9 23:04:42 2016
@@ -45,7 +45,7 @@
 
 <span id="alerts" style="background-color:#ffc; text-align: center;display: block;padding:10px; border-bottom: solid 1px #cc9">
 <strong><a href="news.html">News</a>:</strong>
-Announcing first ever Apache Phoenix conference: [PhoenixCon](http://www.meetup.com/SF-Bay-Area-Apache-Phoenix-Meetup/events/230545182/) 
+Support now available for latest [Apache Phoenix in Amazon EMR](http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html) 
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 
 <a href='https://twitter.com/ApachePhoenix'><img title="Follow Apache Phoenix on Twitter" src="images/follow.png"/></a></span>
 ## Overview

Modified: phoenix/site/source/src/site/markdown/news.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/news.md?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/news.md (original)
+++ phoenix/site/source/src/site/markdown/news.md Thu Jun  9 23:04:42 2016
@@ -1,6 +1,8 @@
 # Apache Phoenix News
 <br/>
 <hr/>
+#### [Announcing support for latest Phoenix in Amazon EMR](http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html) (June 2, 2016)
+<hr/>
 #### [Announcing first ever Phoenix conference on Wed, May 25th 9am-1pm](http://www.meetup.com/SF-Bay-Area-Apache-Phoenix-Meetup/events/230545182/) (April 21, 2016)
 <hr/>
 #### [Announcing transaction support in 4.7.0 release](http://phoenix.apache.org/transactions.html) (March 10, 2016)

Modified: phoenix/site/source/src/site/markdown/phoenix_on_emr.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/phoenix_on_emr.md?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/phoenix_on_emr.md (original)
+++ phoenix/site/source/src/site/markdown/phoenix_on_emr.md Thu Jun  9 23:04:42 2016
@@ -1,43 +1,3 @@
 # Phoenix on Amazon EMR
 
-Follow these steps to deploy HBase with Phoenix on Amazon's Elastic MapReduce (EMR).
-
-### 1. Amazon EMR Configuration
-
-1. Create a free/paid [EMR account](https://portal.aws.amazon.com/gp/aws/developer/registration/index.html) 
-2. [Download](http://aws.amazon.com/developertools/2264) the latest CLI from and follow the setup instructions [here](http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-cli-install.html).
-
-_Note: Step 2 is a multi-step process in which you would install ruby, gem, create credentials file and create a S3 bucket._
-
-### 2. Deploy HBase with Phoenix on EMR using Web Console
-
-##### Using Web Console
-
-Go to _Elastic MapReduce > Create Cluster_ and follow the steps listed below:
-
-![EMR Create Cluster Page](http://phoenix-bin.github.io/client/images/EMR2.png)
-
-1. Type your cluster name
-2. Set _AMI version_ to _3.0.1_
-3. From _Additional Application_ drop down, select HBase and add.
-4. In _Core_ text box, enter the number of HBase region server(s) you want configured for your cluster
-5. Add a _custom action bootstrap_ from dropdown and specify S3 location: ``s3://beta.elasticmapreduce/bootstrap-actions/phoenix/install-phoenix-bootstrap.sh`` and click add.
-6. Click _Create Cluster_
-
-##### Using CLI
-
-Instead of using _Web Console_, you may use following _CLI_ command to deploy _HBase_ with _Phoenix_:
-
- ```
-./elastic-mapreduce --create --instance-type c1.xlarge --name 
-PHOENIX_2.2_install --ami-version 3.0.1 --hbase --alive --bootstrap-action 
-"s3://beta.elasticmapreduce/bootstrap-actions/phoenix/install-phoenix-bootstrap.sh"
-```
-
-### 3. Usage
-
-_SSH_ to the _EMR Master_ and CD to _/home/hadoop/hbase/lib/phoenix/bin_
-
-Create test data: ``./performance localhost 1000000 ``
-
-SQL CLI: ``./sqlline localhost``
+You can now use Phoenix 4.7 on AWS. For a detailed guide, see [here](http://docs.aws.amazon.com/ElasticMapReduce/latest/ReleaseGuide/emr-phoenix.html).

Added: phoenix/site/source/src/site/markdown/phoenix_orm.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/phoenix_orm.md?rev=1747604&view=auto
==============================================================================
--- phoenix/site/source/src/site/markdown/phoenix_orm.md (added)
+++ phoenix/site/source/src/site/markdown/phoenix_orm.md Thu Jun  9 23:04:42 2016
@@ -0,0 +1,196 @@
+# PHO (Phoenix-HBase ORM) <img src="images/pho.png" width="70" height="70" hspace="90"/>
+
+PHO is a Object Relational Mapping (ORM) library for building and executing queries on HBase using Apache Phoenix.
+It provides ORM-like mappings and DSL-style query building. Initially developed and open sourced by
+eHarmony, it is available [here](https://github.com/eHarmony/pho).
+
+Its interfaces and generic annotations allows the ability to switch the data store api in the future without changing the queries.
+Currently, it only supports HBase integration using Apache Phoenix. However, it's very easy to plugin other implementations if need be.
+
+# Entity Class
+Suppose we have the following TestClass we want to query against in our data store:
+
+```java
+  //class must be annotated with Entity
+  import com.google.code.morphia.annotations.Embedded;
+  import com.google.code.morphia.annotations.Entity;
+  @Entity(value="user_matches")
+  public class MatchDataFeedItemDto {
+	  @Embedded
+	  private MatchCommunicationElement communication;
+	  @Embedded
+	  private MatchElement match;
+	  @Embedded
+	  private MatchProfileElement matchedUser;
+  }
+
+  public class MatchElement {
+      // row key
+      @Property(value = "UID")
+      private long userId;
+      @Property(value = "MID")
+      private long matchId;
+      @Property(value = "DLVRYDT")
+      private Date deliveredDate;
+      @Property(value = "STATUS")
+      private int status;
+  }
+```
+
+# Query Building
+
+Query building can be done in DSL style. More advanced query building is under development but, for now, we will use a combination of the QueryBuilder and the static, Hibernate-style Restrictions methods to construct our queries.
+
+### Simple Queries
+
+Construct a query to find all user matches which are delivered in past 2 days and not in closed state
+
+```java
+    import com.eharmony.datastore.api.DataStoreApi;
+	import com.eharmony.datastore.model.MatchDataFeedItemDto;
+	import com.eharmony.datastore.query.QuerySelect;
+	import com.eharmony.datastore.query.builder.QueryBuilder;
+	import com.eharmony.datastore.query.criterion.Restrictions;
+	@Repository
+	public class MatchStoreQueryRepositoryImpl implements MatchStoreQueryRepository {
+		final QuerySelect<MatchDataFeedItemDto, MatchDataFeedItemDto> query = QueryBuilder
+                .builderFor(MatchDataFeedItemDto.class)
+                .select()
+                .add(Restrictions.eq("userId", userId))
+                .add(Restrictions.eq("status", 2))
+                .add(Restrictions.gt("deliveredDate", timeThreshold.getTime())).build();
+        Iterable<MatchDataFeedItemDto> feedItems = dataStoreApi.findAll(query);
+```
+
+### Compound Queries
+
+Construct a more complex query where not only do we want to find items with a date older than a day ago, but also find the matches in different status and order the results by deliveryDate and limit the results size to 10:
+
+```java
+    //provided
+    List<Integer> statusFilters = request.getMatchStatusFilters();
+    String sortBy = request.getSortBy()
+    Disjunction disjunction = new Disjunction();
+    for (Integer statusFilter : statusFilters) {
+    	disjunction.add(Restrictions.eq("status", statusFilter));
+    }
+    final QuerySelect<MatchDataFeedItemDto, MatchDataFeedItemDto> query = QueryBuilder
+                .builderFor(MatchDataFeedItemDto.class)
+                .select()
+                .add(Restrictions.eq("userId", userId))
+                .add(Restrictions.gt("deliveredDate", timeThreshold.getTime()));
+    			.add(disjunction);
+    			.addOrder(new Ordering(sortBy, Order.DESCENDING)).build();
+    Iterable<MatchDataFeedItemDto> feedItems = dataStoreApi.findAll(query);
+```
+
+*Note:* by default, expressions will be ANDed together when added separately.
+
+### Query Interface
+The following query components are supported:
+
+```java
+  // equals
+  EqualityExpression eq(String propertyName, Object value);
+
+  // does not equal (not equals);
+  EqualityExpression ne(String propertyName, Object value);
+
+  // less than
+  EqualityExpression lt(String propertyName, Object value);
+
+  // less than or equal
+  EqualityExpression lte(String propertyName, Object value);
+
+  // greater than
+  EqualityExpression gt(String propertyName, Object value);
+
+  // greater than or equal
+  EqualityExpression gte(String propertyName, Object value);
+
+  // between from and to (inclusive)
+  RangeExpression between(String propertyName, Object from, Object to);
+
+  // and - takes a variable list of expressions as arguments
+  Conjunction and(Criterion... criteria);
+
+  // or - takes a variable list of expressions as arguments
+  Disjunction or(Criterion... criteria);
+
+```
+
+### Resolving Entity and Property Names
+
+Always use the property names of your Java objects in your queries.
+If these names differ from those used in your datastore you will use annotations to provide the mappings.
+Entity Resolvers are configured to map the entity classes to table/collection names.
+Property Resolvers are configured to map the names of your object variables to column/field names.
+
+The following annotations are currently supported for the indicated data store type.
+Custom EntityResolvers and PropertyResolvers are easy to configure and create.
+
+see [Morphia Annotations](https://code.google.com/p/morphia/wiki/AllAnnotations) for entity class annotation mappings
+
+
+## Query Execution
+
+The QueryExecutor interface supports the following operations:
+
+```java
+  // return an iterable of type R from the query against type T (R and T will often be the same type)
+  <T, R> Iterable<R> findAll(QuerySelect<T, R> query);
+  
+  // return aone R from the query against type T
+  <T, R> R findOne(QuerySelect<T, R> query)
+  
+  // save the entity of type T to the data store
+  <T> T save(T entity);
+  
+  // save all of the entities in the provided iterable to data store
+  <T> Iterable<T> save(Iterable<T> entities);
+  
+  // saves all the entities in batches with configured batch size
+  <T> int[] saveBatch(Iterable<T> entities);
+```
+
+## Configuration
+
+Here are some example Spring configuration files for HBase using Apache Phoenix.
+
+### HBase
+configuration proeprties
+hbase.connection.url=jdbc:phoenix:zkhost:2181
+
+```xml
+    <!-- Register your entity bean here -->
+    <util:list id="entityPropertiesMappings">
+	    <value>com.eharmony.datastore.model.MatchDataFeedItemDto</value>
+	</util:list>
+	<bean id="entityPropertiesMappingContext" class="com.eharmony.pho.mapper.EntityPropertiesMappingContext">
+	    <constructor-arg ref="entityPropertiesMappings"/>
+	</bean>
+	
+	<bean id="entityPropertiesResolver" class="com.eharmony.pho.mapper.EntityPropertiesResolver">
+	    <constructor-arg ref="entityPropertiesMappingContext"/>
+	</bean>
+	
+	<bean id="phoenixHBaseQueryTranslator" class="com.eharmony.pho.hbase.translator.PhoenixHBaseQueryTranslator">
+	    <constructor-arg name="propertyResolver" ref="entityPropertiesResolver" />
+	</bean>
+	
+	<bean id="phoenixProjectedResultMapper" class="com.eharmony.pho.hbase.mapper.PhoenixProjectedResultMapper">
+	    <constructor-arg name="entityPropertiesResolver" ref="entityPropertiesResolver" />
+	</bean>
+	
+	<bean id="phoenixHBaseQueryExecutor" class="com.eharmony.pho.hbase.query.PhoenixHBaseQueryExecutor"> 
+	    <constructor-arg name="queryTranslator" ref="phoenixHBaseQueryTranslator"/>
+	    <constructor-arg name="resultMapper" ref="phoenixProjectedResultMapper" />
+	 </bean>
+	 
+	<bean id="dataStoreApi" class="com.eharmony.pho.hbase.PhoenixHBaseDataStoreApiImpl">
+	    <constructor-arg name="connectionUrl" value="${hbase.connection.url}"/>
+	    <constructor-arg name="queryExecutor" ref="phoenixHBaseQueryExecutor"/>
+	</bean>
+
+```
+

Added: phoenix/site/source/src/site/markdown/phoenix_python.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/phoenix_python.md?rev=1747604&view=auto
==============================================================================
--- phoenix/site/source/src/site/markdown/phoenix_python.md (added)
+++ phoenix/site/source/src/site/markdown/phoenix_python.md Thu Jun  9 23:04:42 2016
@@ -0,0 +1,7 @@
+# Phoenix Adapter for Python
+
+A Phoenix adapter is available for Python courtesy of Lukáš Lalinský. For an overview, see
+[here](https://oxygene.sk/2015/07/phoenix-database-adapter-for-python/) and for detailed documentation, see
+[here](https://pythonhosted.org/phoenixdb/).
+
+If you'd like this to become part of our Apache Phoenix distro, please let Lukáš and us know.

Added: phoenix/site/source/src/site/resources/images/pho.png
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/resources/images/pho.png?rev=1747604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: phoenix/site/source/src/site/resources/images/pho.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: phoenix/site/source/src/site/site.xml
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/site.xml?rev=1747604&r1=1747603&r2=1747604&view=diff
==============================================================================
--- phoenix/site/source/src/site/site.xml (original)
+++ phoenix/site/source/src/site/site.xml Thu Jun  9 23:04:42 2016
@@ -88,6 +88,10 @@
             <item href="pig_integration.html" name="Apache Pig Integration"/>
             <item href="phoenix_mr.html" name="Map Reduce Integration"/>
             <item href="flume.html" name="Apache Flume Plugin"/>
+            <item href="http:divider" name=""/>
+            <item href="phoenix_on_emr.html" name="Phoenix on Amazon EMR"/>
+            <item href="phoenix_python.html" name="Phoenix Adapter for Python"/>
+            <item href="phoenix_orm.html" name="Phoenix ORM Library"/>
         </menu>
         <menu name="Features">
             <item href="transactions.html" name="Transactions"/>