http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/0.6.0-incubating/team-list.html
----------------------------------------------------------------------
diff --git a/0.6.0-incubating/team-list.html b/0.6.0-incubating/team-list.html
new file mode 100644
index 0000000..38e61b8
--- /dev/null
+++ b/0.6.0-incubating/team-list.html
@@ -0,0 +1,433 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at 2015-12-30
+ | Rendered using Apache Maven Fluido Skin 1.3.0
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Apache Atlas &#x2013; Team list</title>
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+
+      
+    <script type="text/javascript" 
src="./js/apache-maven-fluido-1.3.0.min.js"></script>
+
+                          
+        
+<script type="text/javascript">$( document ).ready( function() { $( 
'.carousel' ).carousel( { interval: 3500 } ) } );</script>
+          
+            </head>
+        <body class="topBarEnabled">
+          
+                        
+                    
+                
+
+    <div id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container" style="width: 
68%;"><div class="nav-collapse">
+            
+                
+                                <ul class="nav">
+                          <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Atlas <b 
class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="index.html"  title="About">About</a>
+</li>
+                  
+                      <li>      <a 
href="https://cwiki.apache.org/confluence/display/ATLAS";  title="Wiki">Wiki</a>
+</li>
+                  
+                      <li>      <a 
href="https://cwiki.apache.org/confluence/display/ATLAS";  title="News">News</a>
+</li>
+                  
+                      <li>      <a 
href="https://git-wip-us.apache.org/repos/asf/incubator-atlas.git";  
title="Git">Git</a>
+</li>
+                  
+                      <li>      <a 
href="https://issues.apache.org/jira/browse/ATLAS";  title="Jira">Jira</a>
+</li>
+                  
+                      <li>      <a 
href="https://cwiki.apache.org/confluence/display/ATLAS/PoweredBy";  
title="Powered by">Powered by</a>
+</li>
+                  
+                      <li>      <a href="http://blogs.apache.org/atlas/";  
title="Blog">Blog</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Project 
Information <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="project-info.html"  
title="Summary">Summary</a>
+</li>
+                  
+                      <li>      <a href="mail-lists.html"  title="Mailing 
Lists">Mailing Lists</a>
+</li>
+                  
+                      <li>      <a 
href="http://webchat.freenode.net?channels=apacheatlas&uio=d4";  
title="IRC">IRC</a>
+</li>
+                  
+                      <li>      <a href="team-list.html"  title="Team">Team</a>
+</li>
+                  
+                      <li>      <a href="issue-tracking.html"  title="Issue 
Tracking">Issue Tracking</a>
+</li>
+                  
+                      <li>      <a href="source-repository.html"  
title="Source Repository">Source Repository</a>
+</li>
+                  
+                      <li>      <a href="license.html"  
title="License">License</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Releases <b 
class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a 
href="http://www.apache.org/dyn/closer.cgi/incubator/atlas/0.5.0-incubating/";  
title="0.5-incubating">0.5-incubating</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Documentation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="0.5.0-incubating/index.html"  
title="0.5-incubating">0.5-incubating</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <b 
class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a 
href="http://www.apache.org/foundation/how-it-works.html";  title="How Apache 
Works">How Apache Works</a>
+</li>
+                  
+                      <li>      <a href="http://www.apache.org/foundation/";  
title="Foundation">Foundation</a>
+</li>
+                  
+                      <li>      <a 
href="http://www.apache.org/foundation/sponsorship.html";  title="Sponsoring 
Apache">Sponsoring Apache</a>
+</li>
+                  
+                      <li>      <a 
href="http://www.apache.org/foundation/thanks.html";  title="Thanks">Thanks</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+                      <form id="search-form" 
action="http://www.google.com/search"; method="get"  class="navbar-search 
pull-right" >
+    
+  <input value="http://atlas.incubator.apache.org"; name="sitesearch" 
type="hidden"/>
+  <input class="search-query" name="q" id="query" type="text" />
+</form>
+<script type="text/javascript" 
src="http://www.google.com/coop/cse/brand?form=search-form";></script>
+          
+                            
+            
+            
+            
+    <iframe 
src="http://www.facebook.com/plugins/like.php?href=http://atlas.incubator.apache.org/atlas-docs&send=false&layout=button_count&show-faces=false&action=like&colorscheme=dark";
+        scrolling="no" frameborder="0"
+        style="border:none; width:80px; height:20px; margin-top: 10px;"  
class="pull-right" ></iframe>
+                        
+    <script type="text/javascript" 
src="https://apis.google.com/js/plusone.js";></script>
+
+        <ul class="nav pull-right"><li style="margin-top: 10px;">
+    
+    <div class="g-plusone" 
data-href="http://atlas.incubator.apache.org/atlas-docs"; data-size="medium"  
width="60px" align="right" ></div>
+
+        </li></ul>
+                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
+    
+        <div class="container">
+          <div id="banner">
+        <div class="pull-left">
+                                                  <a href=".." id="bannerLeft">
+                                                                               
                 <img src="images/atlas-logo.png"  alt="Apache Atlas" 
width="200px" height="45px"/>
+                </a>
+                      </div>
+        <div class="pull-right">                  <a 
href="http://incubator.apache.org"; id="bannerRight">
+                                                                               
                 <img src="images/apache-incubator-logo.png"  alt="Apache 
Incubator"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                              <li class="">
+                    <a href="http://www.apache.org"; class="externalLink" 
title="Apache">
+        Apache</a>
+        </li>
+      <li class="divider ">/</li>
+            <li class="">
+                    <a href="index.html" title="Atlas">
+        Atlas</a>
+        </li>
+      <li class="divider ">/</li>
+        <li class="">Team list</li>
+        
+                
+                    
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
+            
+                            </ul>
+      </div>
+
+      
+                        
+        <div id="bodyColumn" >
+                                  
+            <div class="section">
+<h2><a name="The_Team"></a>The Team</h2><a name="The_Team"></a>
+<p>A successful project requires many people to play many roles. Some members 
write code or documentation, while others are valuable as testers, submitting 
patches and suggestions.</p>
+<p>The team is comprised of Members and Contributors. Members have direct 
access to the source of a project and actively evolve the code-base. 
Contributors improve the project through submission of patches and suggestions 
to the Members. The number of Contributors to the project is unbounded. Get 
involved today. All contributions to the project are greatly appreciated.</p>
+<div class="section">
+<h3><a name="Members"></a>Members</h3><a name="Members"></a>
+<p>The following is a list of developers with commit privileges that have 
directly contributed to the project in one way or another.</p>
+<table border="0" class="table table-striped">
+<tr class="a">
+<th>Id</th>
+<th>Name</th>
+<th>Email</th>
+<th>Organization</th>
+<th>Roles</th>
+<th>Time Zone</th>
+<th>Actual Time (GMT)</th></tr>
+<tr class="b">
+<td><a name="venkatesh"></a>venkatesh</td>
+<td>Venkatesh Seetharam</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Hortonworks Inc.</td>
+<td>committer, PPMC</td>
+<td>-8</td>
+<td><span id="developer-0">-8</span></td></tr>
+<tr class="a">
+<td><a name="rhbutani"></a>rhbutani</td>
+<td>Harish Butani</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Hortonworks Inc.</td>
+<td>committer, PPMC</td>
+<td>-8</td>
+<td><span id="developer-1">-8</span></td></tr>
+<tr class="b">
+<td><a name="shwethags"></a>shwethags</td>
+<td>Shwetha GS</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Hortonworks Inc.</td>
+<td>committer, PPMC</td>
+<td>+05:30</td>
+<td><span id="developer-2">+05:30</span></td></tr>
+<tr class="a">
+<td><a name="jmaron"></a>jmaron</td>
+<td>Jon Maron</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Hortonworks Inc.</td>
+<td>committer</td>
+<td>-5</td>
+<td><span id="developer-3">-5</span></td></tr>
+<tr class="b">
+<td><a name="AAhn"></a>AAhn</td>
+<td>Andrew Ahn</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Hortonworks Inc.</td>
+<td>committer</td>
+<td>-8</td>
+<td><span id="developer-4">-8</span></td></tr>
+<tr class="a">
+<td><a name="dkaspar"></a>dkaspar</td>
+<td>David Kaspar</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Merck &amp; Co Inc.</td>
+<td>committer</td>
+<td>+1</td>
+<td><span id="developer-5">+1</span></td></tr>
+<tr class="b">
+<td><a name="ilasek"></a>ilasek</td>
+<td>Ivo Lasek</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Merck &amp; Co Inc.</td>
+<td>committer</td>
+<td>+1</td>
+<td><span id="developer-6">+1</span></td></tr>
+<tr class="a">
+<td><a name="dfusaro"></a>dfusaro</td>
+<td>Dennis Fusaro</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Aetna Inc.</td>
+<td>committer</td>
+<td>-5</td>
+<td><span id="developer-7">-5</span></td></tr>
+<tr class="b">
+<td><a name="chyzer"></a>chyzer</td>
+<td>Chris Hyzer</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Aetna Inc.</td>
+<td>committer</td>
+<td>-5</td>
+<td><span id="developer-8">-5</span></td></tr>
+<tr class="a">
+<td><a name="dmarkwat"></a>dmarkwat</td>
+<td>Daniel Markwat</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Aetna Inc.</td>
+<td>committer</td>
+<td>-5</td>
+<td><span id="developer-9">-5</span></td></tr>
+<tr class="b">
+<td><a name="gsenia"></a>gsenia</td>
+<td>Greg Senia</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Aetna Inc.</td>
+<td>committer</td>
+<td>-5</td>
+<td><span id="developer-10">-5</span></td></tr>
+<tr class="a">
+<td><a name="james"></a>james</td>
+<td>James Vollmer</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Target Inc.</td>
+<td>committer</td>
+<td>-6</td>
+<td><span id="developer-11">-6</span></td></tr>
+<tr class="b">
+<td><a name="adossett"></a>adossett</td>
+<td>Aaron Dossett</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Target Inc.</td>
+<td>committer</td>
+<td>-6</td>
+<td><span id="developer-12">-6</span></td></tr>
+<tr class="a">
+<td><a name="mschussler"></a>mschussler</td>
+<td>Mitch Schussler</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>JPMC</td>
+<td>committer</td>
+<td>-5</td>
+<td><span id="developer-13">-5</span></td></tr>
+<tr class="b">
+<td><a name="vavasarala"></a>vavasarala</td>
+<td>Viswanath Avasarala</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Schlumberger Inc.</td>
+<td>committer</td>
+<td>-6</td>
+<td><span id="developer-14">-6</span></td></tr>
+<tr class="a">
+<td><a name="avarma"></a>avarma</td>
+<td>Anil Varma</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Schlumberger Inc.</td>
+<td>committer</td>
+<td>-6</td>
+<td><span id="developer-15">-6</span></td></tr>
+<tr class="b">
+<td><a name="bstortz"></a>bstortz</td>
+<td>Barbara Stortz</td>
+<td>bstortz@sap</td>
+<td>SAP Inc.</td>
+<td>committer</td>
+<td>-8</td>
+<td><span id="developer-16">-8</span></td></tr>
+<tr class="a">
+<td><a name="sriksun"></a>sriksun</td>
+<td>Srikanth Sundarrajan</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>InMobi</td>
+<td>committer, PPMC</td>
+<td>+05:30</td>
+<td><span id="developer-17">+05:30</span></td></tr>
+<tr class="b">
+<td><a name="ssuresh"></a>ssuresh</td>
+<td>Suresh Srinivas</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Hortonworks Inc.</td>
+<td>committer</td>
+<td>-8</td>
+<td><span id="developer-18">-8</span></td></tr>
+<tr class="a">
+<td><a name="vranganathan"></a>vranganathan</td>
+<td>Venkat Ranganathan</td>
+<td><a class="externalLink" 
href="mailto:[email protected]";>[email protected]</a></td>
+<td>Hortonworks Inc.</td>
+<td>committer</td>
+<td>-8</td>
+<td><span id="developer-19">-8</span></td></tr></table></div>
+<div class="section">
+<h3><a name="Contributors"></a>Contributors</h3><a name="Contributors"></a>
+<p>There are no contributors listed for this project. Please check back again 
later.</p><script type="text/javascript">
+function offsetDate(id, offset) {
+    var now = new Date();
+    var nowTime = now.getTime();
+    var localOffset = now.getTimezoneOffset();
+    var developerTime = nowTime + ( offset * 60 * 60 * 1000 )+ ( localOffset * 
60 * 1000 );
+    var developerDate = new Date(developerTime);
+
+    document.getElementById(id).innerHTML = developerDate;
+}
+
+function init(){
+    offsetDate('developer-0', '-8');
+    offsetDate('developer-1', '-8');
+    offsetDate('developer-2', '0');
+    offsetDate('developer-3', '-5');
+    offsetDate('developer-4', '-8');
+    offsetDate('developer-5', '+1');
+    offsetDate('developer-6', '+1');
+    offsetDate('developer-7', '-5');
+    offsetDate('developer-8', '-5');
+    offsetDate('developer-9', '-5');
+    offsetDate('developer-10', '-5');
+    offsetDate('developer-11', '-6');
+    offsetDate('developer-12', '-6');
+    offsetDate('developer-13', '-5');
+    offsetDate('developer-14', '-6');
+    offsetDate('developer-15', '-6');
+    offsetDate('developer-16', '-8');
+    offsetDate('developer-17', '0');
+    offsetDate('developer-18', '-8');
+    offsetDate('developer-19', '-8');
+}
+
+window.onLoad = init();
+</script></div></div>
+                  </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container">
+              <div class="row span12">Copyright &copy;                    2015
+                        <a href="http://www.apache.org";>Apache Software 
Foundation</a>.
+            All Rights Reserved.      
+                    
+      </div>
+
+                          
+                <p id="poweredBy" class="pull-right">
+                          <a href="http://maven.apache.org/"; title="Built by 
Maven" class="poweredBy">
+        <img class="builtBy" alt="Built by Maven" 
src="./images/logos/maven-feather.png" />
+      </a>
+              </p>
+        
+                </div>
+    </footer>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/Architecture.html
----------------------------------------------------------------------
diff --git a/Architecture.html b/Architecture.html
index ccff36e..aadd792 100644
--- a/Architecture.html
+++ b/Architecture.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Architecture</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>
@@ -199,7 +199,16 @@
 <h3><a name="Introduction"></a>Introduction</h3></div>
 <div class="section">
 <h3><a name="Atlas_High_Level_Architecture_-_Overview"></a>Atlas High Level 
Architecture - Overview</h3>
-<p><img src="images/twiki/architecture.png" alt="" /></p></div>
+<p><img src="images/twiki/architecture.png" alt="" /></p>
+<p>Architecturally, Atlas has the following components:</p>
+<p></p>
+<ul>
+<li><b>A Web service</b>: This exposes RESTful APIs and a Web user interface 
to create, update and query metadata.</li>
+<li><b>Metadata store</b>: Metadata is modeled using a graph model, 
implemented using the Graph database Titan. Titan has options for a variety of 
backing stores for persisting the graph, including an embedded Berkeley DB, 
Apache HBase and Apache Cassandra. The choice of the backing store determines 
the level of service availability.</li>
+<li><b>Index store</b>: For powering full text searches on metadata, Atlas 
also indexes the metadata, again via Titan. The backing store for the full text 
search is a search backend like ElasticSearch or Apache Solr.</li>
+<li><b>Bridges / Hooks</b>: To add metadata to Atlas, libraries called 
&#x2018;hooks&#x2019; are enabled in various systems like Apache Hive, Apache 
Falcon and Apache Sqoop which capture metadata events in the respective systems 
and propagate those events to Atlas. The Atlas server consumes these events and 
updates its stores.</li>
+<li><b>Metadata notification events</b>: Any updates to metadata in Atlas, 
either via the Hooks or the API are propagated from Atlas to downstream systems 
via events. Systems like Apache Ranger consume these events and allow 
administrators to act on them, for e.g. to configure policies for Access 
control.</li>
+<li><b>Notification Server</b>: Atlas uses Apache Kafka as a notification 
server for communication between hooks and downstream consumers of metadata 
notification events. Events are written by the hooks and Atlas to different 
Kafka topics. Kafka enables a loosely coupled integration between these 
disparate systems.</li></ul></div>
 <div class="section">
 <h3><a name="Bridges"></a>Bridges</h3>
 <p>External components like hive/sqoop/storm/falcon should model their 
taxonomy using typesystem and register the types with Atlas. For every entity 
created in this external component, the corresponding entity should be 
registered in Atlas as well. This is typically done in a hook which runs in the 
external component and is called for every entity operation. Hook generally 
processes the entity asynchronously using a thread pool to avoid adding latency 
to the main operation. The hook can then build the entity and register the 
entity using Atlas REST APIs. Howerver, any failure in APIs because of network 
issue etc can in result entity not registered in Atlas and hence inconsistent 
metadata.</p>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/Bridge-Hive.html
----------------------------------------------------------------------
diff --git a/Bridge-Hive.html b/Bridge-Hive.html
index 2caf408..8067435 100644
--- a/Bridge-Hive.html
+++ b/Bridge-Hive.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Hive Atlas Bridge</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>
@@ -225,7 +225,7 @@ hive_process(ClassType) - super types [Process] - 
attributes [startTime, endTime
 <li>hive_process - attribute name - &lt;queryString&gt; - trimmed query string 
in lower case</li></ul></div>
 <div class="section">
 <h3><a name="Importing_Hive_Metadata"></a>Importing Hive Metadata</h3>
-<p>org.apache.atlas.hive.bridge.HiveMetaStoreBridge imports the hive metadata 
into Atlas using the model defined in 
org.apache.atlas.hive.model.HiveDataModelGenerator. import-hive.sh command can 
be used to facilitate this. Set the following configuration in 
&lt;atlas-conf&gt;/client.properties and set environment variable HIVE_CONFIG 
to the hive conf directory:</p>
+<p>org.apache.atlas.hive.bridge.HiveMetaStoreBridge imports the hive metadata 
into Atlas using the model defined in 
org.apache.atlas.hive.model.HiveDataModelGenerator. import-hive.sh command can 
be used to facilitate this. Set the following configuration in 
&lt;atlas-conf&gt;/client.properties and set environment variable 
$HIVE_CONF_DIR to the hive conf directory:</p>
 <div class="source">
 <pre>
     &lt;property&gt;
@@ -248,20 +248,17 @@ hive_process(ClassType) - super types [Process] - 
attributes [startTime, endTime
     &lt;/property&gt;
   
 </pre></div>
-<p></p>
-<ul>
-<li>Add 'export HIVE_AUX_JARS_PATH=&lt;atlas package&gt;/hook/hive' in 
hive-env.sh of your hive configuration</li>
-<li>Set the following configuration in 
&lt;atlas-conf&gt;/client.properties</li></ul>
 <div class="source">
 <pre>
-     &lt;property&gt;
-       &lt;name&gt;atlas.cluster.name&lt;/name&gt;
-       &lt;value&gt;primary&lt;/value&gt;
-     &lt;/property&gt;
-     
+    &lt;property&gt;
+      &lt;name&gt;atlas.cluster.name&lt;/name&gt;
+      &lt;value&gt;primary&lt;/value&gt;
+    &lt;/property&gt;
+  
 </pre></div>
 <p></p>
 <ul>
+<li>Add 'export HIVE_AUX_JARS_PATH=&lt;atlas package&gt;/hook/hive' in 
hive-env.sh of your hive configuration</li>
 <li>Copy &lt;atlas-conf&gt;/client.properties and 
&lt;atlas-conf&gt;/application.properties to the hive conf directory.</li></ul>
 <p>The following properties in &lt;atlas-conf&gt;/client.properties control 
the thread pool and notification details:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/Configuration.html
----------------------------------------------------------------------
diff --git a/Configuration.html b/Configuration.html
index 4f8320f..535bae4 100644
--- a/Configuration.html
+++ b/Configuration.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
-    <title>Apache Atlas &#x2013; Configuring Apache Atlas</title>
+    <title>Apache Atlas &#x2013; Configuring Apache Atlas - Application 
Properties</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
     <link rel="stylesheet" href="./css/site.css" />
     <link rel="stylesheet" href="./css/print.css" media="print" />
@@ -179,12 +179,12 @@
         Atlas</a>
         </li>
       <li class="divider ">/</li>
-        <li class="">Configuring Apache Atlas</li>
+        <li class="">Configuring Apache Atlas - Application Properties</li>
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>
@@ -194,17 +194,12 @@
         <div id="bodyColumn" >
                                   
             <div class="section">
-<h2><a name="Configuring_Apache_Atlas"></a>Configuring Apache Atlas</h2></div>
+<h2><a 
name="Configuring_Apache_Atlas_-_Application_Properties"></a>Configuring Apache 
Atlas - Application Properties</h2>
+<p>All configuration in Atlas uses java properties style configuration. The 
main configuration file is application.properties which is in the <b>conf</b> 
dir at the deployed location. It consists of the following sections:</p></div>
 <div class="section">
-<h3><a name="Introduction"></a>Introduction</h3>
-<p>All configuration in Atlas uses java properties style 
configuration.</p></div>
+<h3><a name="Graph_Configs"></a>Graph Configs</h3></div>
 <div class="section">
-<h3><a name="Application_Properties"></a>Application Properties</h3>
-<p>The main configuration file is application.properties which is in the 
<b>conf</b> dir at the deployed location. It consists of the following 
sections:</p></div>
-<div class="section">
-<h4><a name="Graph_Database_Configs"></a>Graph Database Configs</h4></div>
-<div class="section">
-<h5><a name="Graph_persistence_engine"></a>Graph persistence engine</h5>
+<h4><a name="Graph_persistence_engine"></a>Graph persistence engine</h4>
 <p>This section sets up the graph db - titan - to use a persistence engine. 
Please refer to <a 
href="http://s3.thinkaurelius.com/docs/titan/0.5.4/titan-config-ref.html";>link</a>
 for more details. The example below uses BerkeleyDBJE.</p>
 <div class="source">
 <pre>
@@ -213,7 +208,7 @@ atlas.graph.storage.directory=data/berkley
 
 </pre></div></div>
 <div class="section">
-<h6><a name="Graph_persistence_engine_-_Hbase"></a>Graph persistence engine - 
Hbase</h6>
+<h5><a name="Graph_persistence_engine_-_Hbase"></a>Graph persistence engine - 
Hbase</h5>
 <p>Basic configuration</p>
 <div class="source">
 <pre>
@@ -244,8 +239,8 @@ zookeeper.znode.parent=/hbase-unsecure
 
 </pre></div></div>
 <div class="section">
-<h5><a name="Graph_Search_Index"></a>Graph Search Index</h5>
-<p>This section sets up the graph db - titan - to use an search indexing 
system. The example configuration below setsup to use an embedded Elastic 
search indexing system.</p>
+<h4><a name="Graph_Search_Index"></a>Graph Search Index</h4>
+<p>This section sets up the graph db - titan - to use an search indexing 
system. The example configuration below sets up to use an embedded Elastic 
search indexing system.</p>
 <div class="source">
 <pre>
 atlas.graph.index.search.backend=elasticsearch
@@ -257,6 +252,7 @@ atlas.graph.index.search.elasticsearch.create.sleep=2000
 </pre></div></div>
 <div class="section">
 <h5><a name="Graph_Search_Index_-_Solr"></a>Graph Search Index - Solr</h5>
+<p>Please note that Solr installation in Cloud mode is a prerequisite before 
configuring Solr as the search indexing backend. Refer <a 
href="./InstallationSteps.html">InstallationSteps</a> section for Solr 
installation/configuration.</p>
 <div class="source">
 <pre>
  atlas.graph.index.search.backend=solr5
@@ -275,13 +271,13 @@ atlas.graph.index.search.elasticsearch.create.sleep=2000
 <p>Refer <a class="externalLink" 
href="http://s3.thinkaurelius.com/docs/titan/0.5.4/elasticsearch.html";>http://s3.thinkaurelius.com/docs/titan/0.5.4/elasticsearch.html</a>
 and <a class="externalLink" 
href="http://s3.thinkaurelius.com/docs/titan/0.5.4/solr.html";>http://s3.thinkaurelius.com/docs/titan/0.5.4/solr.html</a>
 for chossing between <a href="./ElasticSarch.html">ElasticSarch</a> and Solr. 
Solr in cloud mode is the recommended setup.</p></div>
 <div class="section">
 <h4><a name="Switching_Persistence_Backend"></a>Switching Persistence 
Backend</h4>
-<p>For switching the storage backend from BerkeleyDB to HBase and vice versa, 
refer the documentation for &quot;Graph Persistence Engine&quot; described 
above and restart ATLAS.  The data in the indexing backend needs to be cleared 
else there will be discrepancies between the storage and indexing backend which 
could result in errors during the search.  <a 
href="./ElasticSearch.html">ElasticSearch</a> runs by default in embedded mode 
and the data could easily be cleared by deleting the ATLAS_HOME/data/es 
directory.  For Solr, the collections which were created during ATLAS 
Installation - vertex_index, edge_index, fulltext_index could be deleted which 
will cleanup the indexes</p></div>
+<p>For switching the storage backend from BerkeleyDB to HBase and vice versa, 
refer the documentation for &quot;Graph Persistence Engine&quot; described 
above and restart ATLAS. The data in the indexing backend needs to be cleared 
else there will be discrepancies between the storage and indexing backend which 
could result in errors during the search. <a 
href="./ElasticSearch.html">ElasticSearch</a> runs by default in embedded mode 
and the data could easily be cleared by deleting the ATLAS_HOME/data/es 
directory. For Solr, the collections which were created during ATLAS 
Installation - vertex_index, edge_index, fulltext_index could be deleted which 
will cleanup the indexes</p></div>
 <div class="section">
 <h4><a name="Switching_Index_Backend"></a>Switching Index Backend</h4>
-<p>Switching the Index backend requires clearing the persistence backend data. 
Otherwise there will be discrepancies between the persistence and index 
backends since switching the indexing backend means index data will be lost.   
This leads to &quot;Fulltext&quot; queries not working on the existing data   
For clearing the data for BerkeleyDB, delete the ATLAS_HOME/data/berkeley 
directory   For clearing the data for HBase, in Hbase shell, run 'disable 
titan' and 'drop titan'</p></div>
+<p>Switching the Index backend requires clearing the persistence backend data. 
Otherwise there will be discrepancies between the persistence and index 
backends since switching the indexing backend means index data will be lost. 
This leads to &quot;Fulltext&quot; queries not working on the existing data For 
clearing the data for BerkeleyDB, delete the ATLAS_HOME/data/berkeley directory 
For clearing the data for HBase, in Hbase shell, run 'disable titan' and 'drop 
titan'</p></div>
 <div class="section">
-<h4><a name="Hive_Lineage_Configs"></a>Hive Lineage Configs</h4>
-<p>The higher layer services like hive lineage, schema, etc. are driven by the 
type system and this section encodes the specific types for the hive data 
model.</p>
+<h3><a name="Lineage_Configs"></a>Lineage Configs</h3>
+<p>The higher layer services like lineage, schema, etc. are driven by the type 
system and this section encodes the specific types for the hive data model.</p>
 <p># This models reflects the base super types for Data and Process</p>
 <div class="source">
 <pre>
@@ -295,7 +291,7 @@ atlas.lineage.hive.table.schema.query=hive_table where 
name=?, columns
 
 </pre></div></div>
 <div class="section">
-<h4><a name="Notification_Configs"></a>Notification Configs</h4>
+<h3><a name="Notification_Configs"></a>Notification Configs</h3>
 <p>Refer <a class="externalLink" 
href="http://kafka.apache.org/documentation.html#configuration";>http://kafka.apache.org/documentation.html#configuration</a>
 for Kafka configuration. All Kafka configs should be prefixed with 
'atlas.kafka.'</p>
 <div class="source">
 <pre>
@@ -316,17 +312,18 @@ atlas.kafka.entities.group.id=&lt;consumer id&gt;
 
 </pre></div></div>
 <div class="section">
-<h4><a name="Client_Configs"></a>Client Configs</h4>
+<h3><a name="Client_Configs"></a>Client Configs</h3>
 <div class="source">
 <pre>
 atlas.client.readTimeoutMSecs=60000
 atlas.client.connectTimeoutMSecs=60000
+atlas.rest.address=&lt;http/https&gt;://&lt;atlas-fqdn&gt;:&lt;atlas port&gt; 
- default http://localhost:21000
 
 </pre></div></div>
 <div class="section">
-<h4><a name="Security_Properties"></a>Security Properties</h4></div>
+<h3><a name="Security_Properties"></a>Security Properties</h3></div>
 <div class="section">
-<h5><a name="SSL_config"></a>SSL config</h5>
+<h4><a name="SSL_config"></a>SSL config</h4>
 <p>The following property is used to toggle the SSL feature.</p>
 <div class="source">
 <pre>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/HighAvailability.html
----------------------------------------------------------------------
diff --git a/HighAvailability.html b/HighAvailability.html
new file mode 100644
index 0000000..bca44aa
--- /dev/null
+++ b/HighAvailability.html
@@ -0,0 +1,305 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at 2015-12-30
+ | Rendered using Apache Maven Fluido Skin 1.3.0
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Apache Atlas &#x2013; Fault Tolerance and High Availability 
Options</title>
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+
+      
+    <script type="text/javascript" 
src="./js/apache-maven-fluido-1.3.0.min.js"></script>
+
+                          
+        
+<script type="text/javascript">$( document ).ready( function() { $( 
'.carousel' ).carousel( { interval: 3500 } ) } );</script>
+          
+            </head>
+        <body class="topBarEnabled">
+          
+                        
+                    
+                
+
+    <div id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container" style="width: 
68%;"><div class="nav-collapse">
+            
+                
+                                <ul class="nav">
+                          <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Atlas <b 
class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="index.html"  title="About">About</a>
+</li>
+                  
+                      <li>      <a 
href="https://cwiki.apache.org/confluence/display/ATLAS";  title="Wiki">Wiki</a>
+</li>
+                  
+                      <li>      <a 
href="https://cwiki.apache.org/confluence/display/ATLAS";  title="News">News</a>
+</li>
+                  
+                      <li>      <a 
href="https://git-wip-us.apache.org/repos/asf/incubator-atlas.git";  
title="Git">Git</a>
+</li>
+                  
+                      <li>      <a 
href="https://issues.apache.org/jira/browse/ATLAS";  title="Jira">Jira</a>
+</li>
+                  
+                      <li>      <a 
href="https://cwiki.apache.org/confluence/display/ATLAS/PoweredBy";  
title="Powered by">Powered by</a>
+</li>
+                  
+                      <li>      <a href="http://blogs.apache.org/atlas/";  
title="Blog">Blog</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Project 
Information <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="project-info.html"  
title="Summary">Summary</a>
+</li>
+                  
+                      <li>      <a href="mail-lists.html"  title="Mailing 
Lists">Mailing Lists</a>
+</li>
+                  
+                      <li>      <a 
href="http://webchat.freenode.net?channels=apacheatlas&uio=d4";  
title="IRC">IRC</a>
+</li>
+                  
+                      <li>      <a href="team-list.html"  title="Team">Team</a>
+</li>
+                  
+                      <li>      <a href="issue-tracking.html"  title="Issue 
Tracking">Issue Tracking</a>
+</li>
+                  
+                      <li>      <a href="source-repository.html"  
title="Source Repository">Source Repository</a>
+</li>
+                  
+                      <li>      <a href="license.html"  
title="License">License</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Releases <b 
class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a 
href="http://www.apache.org/dyn/closer.cgi/incubator/atlas/0.5.0-incubating/";  
title="0.5-incubating">0.5-incubating</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Documentation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="0.5.0-incubating/index.html"  
title="0.5-incubating">0.5-incubating</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <b 
class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a 
href="http://www.apache.org/foundation/how-it-works.html";  title="How Apache 
Works">How Apache Works</a>
+</li>
+                  
+                      <li>      <a href="http://www.apache.org/foundation/";  
title="Foundation">Foundation</a>
+</li>
+                  
+                      <li>      <a 
href="http://www.apache.org/foundation/sponsorship.html";  title="Sponsoring 
Apache">Sponsoring Apache</a>
+</li>
+                  
+                      <li>      <a 
href="http://www.apache.org/foundation/thanks.html";  title="Thanks">Thanks</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+                      <form id="search-form" 
action="http://www.google.com/search"; method="get"  class="navbar-search 
pull-right" >
+    
+  <input value="http://atlas.incubator.apache.org"; name="sitesearch" 
type="hidden"/>
+  <input class="search-query" name="q" id="query" type="text" />
+</form>
+<script type="text/javascript" 
src="http://www.google.com/coop/cse/brand?form=search-form";></script>
+          
+                            
+            
+            
+            
+    <iframe 
src="http://www.facebook.com/plugins/like.php?href=http://atlas.incubator.apache.org/atlas-docs&send=false&layout=button_count&show-faces=false&action=like&colorscheme=dark";
+        scrolling="no" frameborder="0"
+        style="border:none; width:80px; height:20px; margin-top: 10px;"  
class="pull-right" ></iframe>
+                        
+    <script type="text/javascript" 
src="https://apis.google.com/js/plusone.js";></script>
+
+        <ul class="nav pull-right"><li style="margin-top: 10px;">
+    
+    <div class="g-plusone" 
data-href="http://atlas.incubator.apache.org/atlas-docs"; data-size="medium"  
width="60px" align="right" ></div>
+
+        </li></ul>
+                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
+    
+        <div class="container">
+          <div id="banner">
+        <div class="pull-left">
+                                                  <a href=".." id="bannerLeft">
+                                                                               
                 <img src="images/atlas-logo.png"  alt="Apache Atlas" 
width="200px" height="45px"/>
+                </a>
+                      </div>
+        <div class="pull-right">                  <a 
href="http://incubator.apache.org"; id="bannerRight">
+                                                                               
                 <img src="images/apache-incubator-logo.png"  alt="Apache 
Incubator"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                              <li class="">
+                    <a href="http://www.apache.org"; class="externalLink" 
title="Apache">
+        Apache</a>
+        </li>
+      <li class="divider ">/</li>
+            <li class="">
+                    <a href="index.html" title="Atlas">
+        Atlas</a>
+        </li>
+      <li class="divider ">/</li>
+        <li class="">Fault Tolerance and High Availability Options</li>
+        
+                
+                    
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
+            
+                            </ul>
+      </div>
+
+      
+                        
+        <div id="bodyColumn" >
+                                  
+            <div class="section">
+<h2><a name="Fault_Tolerance_and_High_Availability_Options"></a>Fault 
Tolerance and High Availability Options</h2></div>
+<div class="section">
+<h3><a name="Introduction"></a>Introduction</h3>
+<p>Apache Atlas uses and interacts with a variety of systems to provide 
metadata management and data lineage to data administrators. By choosing and 
configuring these dependencies appropriately, it is possible to achieve a good 
degree of service availability with Atlas. This document describes the state of 
high availability support in Atlas, including its capabilities and current 
limitations, and also the configuration required for achieving a this level of 
high availability.</p>
+<p><a href="./Architecture.html">The architecture page</a> in the wiki gives 
an overview of the various components that make up Atlas. The options mentioned 
below for various components derive context from the above page, and would be 
worthwhile to review before proceeding to read this page.</p></div>
+<div class="section">
+<h3><a name="Atlas_Web_Service"></a>Atlas Web Service</h3>
+<p>Currently, the Atlas Web service has a limitation that it can only have one 
active instance at a time. Therefore, in case of errors to the host running the 
service, a new Atlas web service instance should be brought up and pointed to 
from the clients. In future versions of the system, we plan to provide full 
High Availability of the service, thereby enabling hot failover. To minimize 
service loss, we recommend the following:</p>
+<p></p>
+<ul>
+<li>An extra physical host with the Atlas system software and configuration is 
available to be brought up on demand.</li>
+<li>It would be convenient to have the web service fronted by a proxy solution 
like <a class="externalLink" 
href="https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#5.2";>HAProxy</a>
 which can be used to provide both the monitoring and transparent switching of 
the backend instance clients talk to.
+<ul>
+<li>An example HAProxy configuration of this form will allow a transparent 
failover to a backup server:</li></ul></li></ul>
+<div class="source">
+<pre>
+      listen atlas
+        bind &lt;proxy hostname&gt;:&lt;proxy port&gt;
+        balance roundrobin
+        server inst1 &lt;atlas server hostname&gt;:&lt;port&gt; check
+        server inst2 &lt;atlas backup server hostname&gt;:&lt;port&gt; check 
backup
+      
+</pre></div>
+<p></p>
+<ul>
+<li>The stores that hold Atlas data can be configured to be highly available 
as described below.</li></ul></div>
+<div class="section">
+<h3><a name="Metadata_Store"></a>Metadata Store</h3>
+<p>As described above, Atlas uses Titan to store the metadata it manages. By 
default, Titan uses BerkeleyDB as an embedded backing store. However, this 
option would result in loss of data if the node running the Atlas server fails. 
In order to provide HA for the metadata store, we recommend that Atlas be 
configured to use HBase as the backing store for Titan. Doing this implies that 
you could benefit from the HA guarantees HBase provides. In order to configure 
Atlas to use HBase in HA mode, do the following:</p>
+<p></p>
+<ul>
+<li>Choose an existing HBase cluster that is set up in HA mode to configure in 
Atlas (OR) Set up a new HBase cluster in <a class="externalLink" 
href="http://hbase.apache.org/book.html#quickstart_fully_distributed";>HA 
mode</a>.
+<ul>
+<li>If setting up HBase for Atlas, please following instructions listed for 
setting up HBase in the <a href="./InstallationSteps.html">Installation 
Steps</a>.</li></ul></li>
+<li>We recommend using more than one HBase masters (at least 2) in the cluster 
on different physical hosts that use Zookeeper for coordination to provide 
redundancy and high availability of HBase.
+<ul>
+<li>Refer to the <a href="./Configuration.html">Configuration page</a> for the 
options to configure in atlas.properties to setup Atlas with 
HBase.</li></ul></li></ul></div>
+<div class="section">
+<h3><a name="Index_Store"></a>Index Store</h3>
+<p>As described above, Atlas indexes metadata through Titan to support full 
text search queries. In order to provide HA for the index store, we recommend 
that Atlas be configured to use Solr as the backing index store for Titan. In 
order to configure Atlas to use Solr in HA mode, do the following:</p>
+<p></p>
+<ul>
+<li>Choose an existing SolrCloud cluster setup in HA mode to configure in 
Atlas (OR) Set up a new <a class="externalLink" 
href="https://cwiki.apache.org/confluence/display/solr/SolrCloud";>SolrCloud 
cluster</a>.
+<ul>
+<li>Ensure Solr is brought up on at least 2 physical hosts for redundancy, and 
each host runs a Solr node.</li>
+<li>We recommend the number of replicas to be set to at least 2 for 
redundancy.</li></ul></li>
+<li>Create the SolrCloud collections required by Atlas, as described in <a 
href="./InstallationSteps.html">Installation Steps</a></li>
+<li>Refer to the <a href="./Configuration.html">Configuration page</a> for the 
options to configure in atlas.properties to setup Atlas with 
Solr.</li></ul></div>
+<div class="section">
+<h3><a name="Notification_Server"></a>Notification Server</h3>
+<p>Metadata notification events from Hooks are sent to Atlas by writing them 
to a Kafka topic called <b>ATLAS_HOOK</b>. Similarly, events from Atlas to 
other integrating components like Ranger, are written to a Kafka topic called 
<b>ATLAS_ENTITIES</b>. Since Kafka persists these messages, the events will not 
be lost even if the consumers are down as the events are being sent. In 
addition, we recommend Kafka is also setup for fault tolerance so that it has 
higher availability guarantees. In order to configure Atlas to use Kafka in HA 
mode, do the following:</p>
+<p></p>
+<ul>
+<li>Choose an existing Kafka cluster set up in HA mode to configure in Atlas 
(OR) Set up a new Kafka cluster.</li>
+<li>We recommend that there are more than one Kafka brokers in the cluster on 
different physical hosts that use Zookeeper for coordination to provide 
redundancy and high availability of Kafka.
+<ul>
+<li>Setup at least 2 physical hosts for redundancy, each hosting a Kafka 
broker.</li></ul></li>
+<li>Set up Kafka topics for Atlas usage:
+<ul>
+<li>The number of partitions for the ATLAS topics should be set to 1 
(numPartitions)</li>
+<li>Decide number of replicas for Kafka topic: Set this to at least 2 for 
redundancy.</li>
+<li>Run the following commands:</li></ul></li></ul>
+<div class="source">
+<pre>
+      $KAFKA_HOME/bin/kafka-topics.sh --create --zookeeper &lt;list of 
zookeeper host:port entries&gt; --topic ATLAS_HOOK --replication-factor 
&lt;numReplicas&gt; --partitions 1
+      $KAFKA_HOME/bin/kafka-topics.sh --create --zookeeper &lt;list of 
zookeeper host:port entries&gt; --topic ATLAS_ENTITIES --replication-factor 
&lt;numReplicas&gt; --partitions 1
+      Here KAFKA_HOME points to the Kafka installation directory.
+      
+</pre></div>
+<p></p>
+<ul>
+<li>In application.properties, set the following configuration:</li></ul>
+<div class="source">
+<pre>
+     atlas.notification.embedded=false
+     atlas.kafka.zookeeper.connect=&lt;comma separated list of servers forming 
Zookeeper quorum used by Kafka&gt;
+     atlas.kafka.bootstrap.servers=&lt;comma separated list of Kafka broker 
endpoints in host:port form&gt; - Give at least 2 for redundancy.
+     
+</pre></div></div>
+<div class="section">
+<h3><a name="Known_Issues"></a>Known Issues</h3>
+<p></p>
+<ul>
+<li><a class="externalLink" 
href="https://issues.apache.org/jira/browse/ATLAS-338";>ATLAS-338</a>: 
ATLAS-338: Metadata events generated from a Hive CLI (as opposed to Beeline or 
any client going <a href="./HiveServer.html">HiveServer</a>2) would be lost if 
Atlas server is down.</li>
+<li>If the HBase region servers hosting the Atlas &#x2018;titan&#x2019; HTable 
are down, Atlas would not be able to store or retrieve metadata from HBase 
until they are brought back online.</li></ul></div>
+                  </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container">
+              <div class="row span12">Copyright &copy;                    2015
+                        <a href="http://www.apache.org";>Apache Software 
Foundation</a>.
+            All Rights Reserved.      
+                    
+      </div>
+
+                          
+                <p id="poweredBy" class="pull-right">
+                          <a href="http://maven.apache.org/"; title="Built by 
Maven" class="poweredBy">
+        <img class="builtBy" alt="Built by Maven" 
src="./images/logos/maven-feather.png" />
+      </a>
+              </p>
+        
+                </div>
+    </footer>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/InstallationSteps.html
----------------------------------------------------------------------
diff --git a/InstallationSteps.html b/InstallationSteps.html
index cc307db..6020b11 100644
--- a/InstallationSteps.html
+++ b/InstallationSteps.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Building & Installing Apache Atlas</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>
@@ -312,7 +312,7 @@ export METADATA_SERVER_OPTS=&quot;-Djava.awt.headless=true 
-Djava.security.krb5.
 
 </pre></div>
 <p>* Hbase as the Storage Backend for the Graph Repository</p>
-<p>By default, Atlas uses Titan as the graph repository and is the only graph 
repository implementation available currently. The HBase versions currently 
supported are 0.98.x, 1.0.x, 1.1.x. For configuring ATLAS graph persistence on 
HBase, please go through the &quot;Configuration - Graph persistence engine - 
HBase&quot; section for more details.</p>
+<p>By default, Atlas uses Titan as the graph repository and is the only graph 
repository implementation available currently. The HBase versions currently 
supported are 1.1.x. For configuring ATLAS graph persistence on HBase, please 
go through the &quot;Configuration - Graph persistence engine - HBase&quot; 
section for more details.</p>
 <p>Pre-requisites for running HBase as a distributed cluster  * 3 or 5 <a 
href="./ZooKeeper.html">ZooKeeper</a> nodes  * Atleast 3 <a 
href="./RegionServer.html">RegionServer</a> nodes. It would be ideal to run the 
<a href="./DataNodes.html">DataNodes</a> on the same hosts as the Region 
servers for data locality.</p>
 <p>* Configuring SOLR as the Indexing Backend for the Graph Repository</p>
 <p>By default, Atlas uses Titan as the graph repository and is the only graph 
repository implementation available currently. For configuring Titan to work 
with Solr, please follow the instructions below</p>
@@ -325,26 +325,17 @@ export 
METADATA_SERVER_OPTS=&quot;-Djava.awt.headless=true -Djava.security.krb5.
   For a small cluster, running with an existing ZooKeeper quorum should be 
fine. For larger clusters, you would want to run separate multiple ZooKeeper 
quorum with atleast 3 servers.
   Note: Atlas currently supports solr in &quot;cloud&quot; mode only. 
&quot;http&quot; mode is not supported. For more information, refer solr 
documentation - https://cwiki.apache.org/confluence/display/solr/SolrCloud
 
-* Run the following commands from SOLR_HOME directory to create collections in 
Solr corresponding to the indexes that Atlas uses. In the case that the ATLAS 
and SOLR instance are on 2 different hosts,
-  first copy the required configuration files from ATLAS_HOME/conf/solr on the 
ATLAS instance host to the Solr instance host. SOLR_CONF in the below mentioned 
commands refer to the directory where the solr configuration files
-  have been copied to on Solr host:
-
-  bin/solr create -c vertex_index -d SOLR_CONF -shards #numShards 
-replicationFactor #replicationFactor
-  bin/solr create -c edge_index -d SOLR_CONF -shards #numShards 
-replicationFactor #replicationFactor
-  bin/solr create -c fulltext_index -d SOLR_CONF -shards #numShards 
-replicationFactor #replicationFactor
-
-  Note: If numShards and replicationFactor are not specified, they default to 
1 which suffices if you are trying out solr with ATLAS on a single node 
instance.
-  Otherwise specify numShards according to the number of hosts that are in the 
Solr cluster and the maxShardsPerNode configuration.
-  The number of shards cannot exceed the total number of Solr nodes in your 
SolrCloud cluster
-
-* Change ATLAS configuration to point to the Solr instance setup. Please make 
sure the following configurations are set to the below values in 
ATLAS_HOME//conf/application.properties
- atlas.graph.index.search.backend=solr5
- atlas.graph.index.search.solr.mode=cloud
- atlas.graph.index.search.solr.zookeeper-url=&lt;the ZK quorum setup for solr 
as comma separated value&gt; eg: 10.1.6.4:2181,10.1.6.5:2181
-
-* Restart Atlas
-
+* For e.g., to bring up a Solr node listening on port 8983 on a machine, you 
can use the command:
+      &lt;verbatim&gt;
+      $SOLR_HOME/bin/solr start -c -z &lt;zookeeper_host:port&gt; -p 8983
+      
 </pre></div>
+<p>* Run the following commands from SOLR_HOME directory to create collections 
in Solr corresponding to the indexes that Atlas uses. In the case that the 
ATLAS and SOLR instance are on 2 different hosts,   first copy the required 
configuration files from ATLAS_HOME/conf/solr on the ATLAS instance host to the 
Solr instance host. SOLR_CONF in the below mentioned commands refer to the 
directory where the solr configuration files   have been copied to on Solr 
host:</p>
+<p>bin/solr create -c vertex_index -d SOLR_CONF -shards #numShards 
-replicationFactor #replicationFactor   bin/solr create -c edge_index -d 
SOLR_CONF -shards #numShards -replicationFactor #replicationFactor   bin/solr 
create -c fulltext_index -d SOLR_CONF -shards #numShards -replicationFactor 
#replicationFactor</p>
+<p>Note: If numShards and replicationFactor are not specified, they default to 
1 which suffices if you are trying out solr with ATLAS on a single node 
instance.   Otherwise specify numShards according to the number of hosts that 
are in the Solr cluster and the maxShardsPerNode configuration.   The number of 
shards cannot exceed the total number of Solr nodes in your SolrCloud 
cluster.</p>
+<p>The number of replicas (replicationFactor) can be set according to the 
redundancy required.</p>
+<p>* Change ATLAS configuration to point to the Solr instance setup. Please 
make sure the following configurations are set to the below values in 
ATLAS_HOME//conf/application.properties  atlas.graph.index.search.backend=solr5 
 atlas.graph.index.search.solr.mode=cloud  
atlas.graph.index.search.solr.zookeeper-url=&lt;the ZK quorum setup for solr as 
comma separated value&gt; eg: 10.1.6.4:2181,10.1.6.5:2181</p>
+<p>* Restart Atlas &lt;/verbatim&gt;</p>
 <p>For more information on Titan solr configuration , please refer <a 
class="externalLink" 
href="http://s3.thinkaurelius.com/docs/titan/0.5.4/solr.htm";>http://s3.thinkaurelius.com/docs/titan/0.5.4/solr.htm</a></p>
 <p>Pre-requisites for running Solr in cloud mode   * Memory - Solr is both 
memory and CPU intensive. Make sure the server running Solr has adequate 
memory, CPU and disk.     Solr works well with 32GB RAM. Plan to provide as 
much memory as possible to Solr process   * Disk - If the number of entities 
that need to be stored are large, plan to have at least 500 GB free space in 
the volume where Solr is going to store the index data   * <a 
href="./SolrCloud.html">SolrCloud</a> has support for replication and sharding. 
It is highly recommended to use <a href="./SolrCloud.html">SolrCloud</a> with 
at least two Solr nodes running on different servers with replication enabled.  
   If using <a href="./SolrCloud.html">SolrCloud</a>, then you also need <a 
href="./ZooKeeper.html">ZooKeeper</a> installed and configured with 3 or 5 <a 
href="./ZooKeeper.html">ZooKeeper</a> nodes</p>
 <p><b>Starting Atlas Server</b></p>
@@ -357,6 +348,9 @@ bin/atlas_start.py [-port &lt;port&gt;]
 <p><b>Using Atlas</b></p>
 <div class="source">
 <pre>
+* Quick start model - sample model and data
+  bin/quick_start.py [&lt;atlas endpoint&gt;]
+
 * Verify if the server is up and running
   curl -v http://localhost:21000/api/atlas/admin/version
   {&quot;Version&quot;:&quot;v0.1&quot;}

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/Notification-Entity.html
----------------------------------------------------------------------
diff --git a/Notification-Entity.html b/Notification-Entity.html
index 088f34f..ca427f6 100644
--- a/Notification-Entity.html
+++ b/Notification-Entity.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Entity Change Notifications</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/QuickStart.html
----------------------------------------------------------------------
diff --git a/QuickStart.html b/QuickStart.html
index 81d6935..a4664e5 100644
--- a/QuickStart.html
+++ b/QuickStart.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Quick Start Guide</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/Repository.html
----------------------------------------------------------------------
diff --git a/Repository.html b/Repository.html
index dd89299..20c0d33 100644
--- a/Repository.html
+++ b/Repository.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Repository</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/Search.html
----------------------------------------------------------------------
diff --git a/Search.html b/Search.html
index f812d3e..7a8d042 100644
--- a/Search.html
+++ b/Search.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Search</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/Security.html
----------------------------------------------------------------------
diff --git a/Security.html b/Security.html
index ab0481c..0ba9472 100644
--- a/Security.html
+++ b/Security.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Security Features of Apache Atlas</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>
@@ -273,7 +273,8 @@
 <li><code>atlas.http.authentication.enabled</code> (true|false) [default: 
false] - a property indicating whether to enable HTTP authentication</li>
 <li><code>atlas.http.authentication.type</code> (simple|kerberos) [default: 
simple] - the authentication type</li>
 <li><code>atlas.http.authentication.kerberos.principal</code> - the 
web-application Kerberos principal name. The Kerberos principal name must start 
with &quot;HTTP/...&quot;. For example: &quot;HTTP/localhost@LOCALHOST&quot;. 
There is no default value.</li>
-<li><code>atlas.http.authentication.kerberos.keytab</code> - the path to the 
keytab file containing the credentials for the kerberos principal.</li></ul>
+<li><code>atlas.http.authentication.kerberos.keytab</code> - the path to the 
keytab file containing the credentials for the kerberos principal.</li>
+<li><code>atlas.rest.address</code> - 
&lt;http/https&gt;://&lt;atlas-fqdn&gt;:&lt;atlas port&gt;</li></ul>
 <p>For a more detailed discussion of the HTTP authentication mechanism refer 
to <a class="externalLink" 
href="http://hadoop.apache.org/docs/stable/hadoop-auth/Configuration.html";>Hadoop
 Auth, Java HTTP SPNEGO 2.6.0 - Server Side Configuration</a>.  The prefix that 
document references is &quot;atlas.http.authentication&quot; in the case of the 
Atlas authentication implementation.</p></div>
 <div class="section">
 <h4><a name="Client_security_configuration"></a>Client security 
configuration</h4>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/TypeSystem.html
----------------------------------------------------------------------
diff --git a/TypeSystem.html b/TypeSystem.html
index 916a3b8..d45e18b 100644
--- a/TypeSystem.html
+++ b/TypeSystem.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Type System</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/api/application.wadl
----------------------------------------------------------------------
diff --git a/api/application.wadl b/api/application.wadl
index 9bcb6c8..170314d 100644
--- a/api/application.wadl
+++ b/api/application.wadl
@@ -14,6 +14,18 @@ unique attribute for the give type.]]>
           <wadl:representation mediaType="application/json"/>
         </wadl:response>
       </wadl:method>
+      <wadl:method name="PUT">
+        <wadl:doc>
+          <![CDATA[Complete update of a set of entities - the values not 
specified will be replaced with null/removed
+Adds/Updates given entities identified by its GUID or unique attribute]]>
+        </wadl:doc>
+        <wadl:response>
+          <wadl:doc>
+            <![CDATA[response payload as json]]>
+          </wadl:doc>
+          <wadl:representation mediaType="application/json"/>
+        </wadl:response>
+      </wadl:method>
       <wadl:method name="GET">
         <wadl:request>
           <wadl:param name="type" style="query"/>
@@ -114,45 +126,65 @@ Typically, would be one of all, TRAIT, CLASS, ENUM, 
STRUCT]]>
         </wadl:response>
       </wadl:method>
     </wadl:resource>
-    <wadl:resource path="/api/atlas/entities/{guid}">
-      <wadl:param name="guid" style="template">
-        <wadl:doc>
-          <![CDATA[GUID for the entity]]>
-        </wadl:doc>
-      </wadl:param>
-      <wadl:method name="GET">
-        <wadl:doc>
-          <![CDATA[Fetch the complete definition of an entity given its 
GUID.]]>
-        </wadl:doc>
-        <wadl:request/>
-        <wadl:response>
-          <wadl:representation mediaType="application/json"/>
-        </wadl:response>
-      </wadl:method>
-      <wadl:method name="PUT">
+    <wadl:resource path="/api/atlas/entities/qualifiedName">
+      <wadl:method name="POST">
         <wadl:doc>
-          <![CDATA[Adds property to the given entity id]]>
+          <![CDATA[Adds/Updates given entity identified by its unique 
attribute( entityType, attributeName and value)
+Updates support only partial update of an entity - Adds/updates any new values 
specified
+Updates do not support removal of attribute values]]>
         </wadl:doc>
         <wadl:request>
+          <wadl:param name="type" style="query">
+            <wadl:doc>
+              <![CDATA[the entity type]]>
+            </wadl:doc>
+          </wadl:param>
           <wadl:param name="property" style="query">
             <wadl:doc>
-              <![CDATA[property to add]]>
+              <![CDATA[the unique attribute used to identify the entity]]>
             </wadl:doc>
           </wadl:param>
           <wadl:param name="value" style="query">
             <wadl:doc>
-              <![CDATA[property's value]]>
+              <![CDATA[the unique attributes value]]>
             </wadl:doc>
           </wadl:param>
         </wadl:request>
         <wadl:response>
           <wadl:doc>
-            <![CDATA[response payload as json]]>
+            <![CDATA[response payload as json
+The body contains the JSONArray of entity json. The service takes care of 
de-duping the entities based on any
+unique attribute for the give type.]]>
           </wadl:doc>
           <wadl:representation mediaType="application/json"/>
         </wadl:response>
       </wadl:method>
     </wadl:resource>
+    <wadl:resource path="/api/atlas/entities/{guid}">
+      <wadl:param name="guid" style="template"/>
+      <wadl:method name="POST">
+        <wadl:doc>
+          <![CDATA[Updates entity identified by its GUID
+Support Partial update of an entity - Adds/updates any new values specified
+Does not support removal of attribute values]]>
+        </wadl:doc>
+        <wadl:request>
+          <wadl:param name="property" style="query"/>
+        </wadl:request>
+        <wadl:response>
+          <wadl:representation mediaType="application/json"/>
+        </wadl:response>
+      </wadl:method>
+      <wadl:method name="GET">
+        <wadl:doc>
+          <![CDATA[Fetch the complete definition of an entity given its 
GUID.]]>
+        </wadl:doc>
+        <wadl:request/>
+        <wadl:response>
+          <wadl:representation mediaType="application/json"/>
+        </wadl:response>
+      </wadl:method>
+    </wadl:resource>
     <wadl:resource path="/api/atlas/graph/vertices">
       <wadl:method name="GET">
         <wadl:doc>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/api/resource_EntityResource.html
----------------------------------------------------------------------
diff --git a/api/resource_EntityResource.html b/api/resource_EntityResource.html
index 36065dc..26e649d 100644
--- a/api/resource_EntityResource.html
+++ b/api/resource_EntityResource.html
@@ -85,9 +85,20 @@ of the Type they correspond with.</p>
         <li>
         <a 
href="#path__entities_-guid-_traits_-traitName-.html">/entities/{guid}/traits/{traitName}</a>
         </li>
+        <li>
+        <a 
href="#path__entities_qualifiedName.html">/entities/qualifiedName</a>
+        </li>
       </ul>
         <a name="path__entities.html"></a>
       <h1>/entities</h1>
+      <p>
+        The following operations are supported on this resource:
+      </p>
+      <ul>
+        <li><a href="#POST">POST</a></li>
+        <li><a href="#PUT">PUT</a></li>
+        <li><a href="#GET">GET</a></li>
+      </ul>
       <a name="POST"></a>
       <h2>POST</h2>
       <p>
@@ -107,6 +118,24 @@ unique attribute for the give type.
         </tr>
       </table>
       <p>(no documentation provided)</p>
+      <a name="PUT"></a>
+      <h2>PUT</h2>
+      <p>
+            Complete update of a set of entities - the values not specified 
will be replaced with null/removed
+Adds/Updates given entities identified by its GUID or unique attribute
+          </p>
+      <h3>Response Body</h3>
+      <table>
+        <tr>
+          <td align="right">element:</td>
+          <td>(custom)</td>
+        </tr>
+        <tr>
+          <td align="right">media types:</td>
+          <td>application/json</td>
+        </tr>
+      </table>
+      <p>response payload as json</p>
       <a name="GET"></a>
       <h2>GET</h2>
       <h3>Parameters</h3>
@@ -156,10 +185,12 @@ unique attribute for the give type.
       <p>(no documentation provided)</p>
         <a name="path__entities_-guid-.html"></a>
       <h1>/entities/{guid}</h1>
-      <a name="GET"></a>
-      <h2>GET</h2>
+      <a name="POST"></a>
+      <h2>POST</h2>
       <p>
-            Fetch the complete definition of an entity given its GUID.
+            Updates entity identified by its GUID
+Support Partial update of an entity - Adds/updates any new values specified
+Does not support removal of attribute values
           </p>
       <h3>Parameters</h3>
       <table>
@@ -172,11 +203,19 @@ unique attribute for the give type.
         <tr>
           <td>guid</td>
           <td>
-            GUID for the entity
+            (no documentation provided)
           </td>
           <td>path</td>
           <td></td>
         </tr>
+        <tr>
+          <td>property</td>
+          <td>
+            (no documentation provided)
+          </td>
+          <td>query</td>
+          <td></td>
+        </tr>
       </table>
       <h3>Response Body</h3>
       <table>
@@ -190,10 +229,10 @@ unique attribute for the give type.
         </tr>
       </table>
       <p>(no documentation provided)</p>
-      <a name="PUT"></a>
-      <h2>PUT</h2>
+      <a name="GET"></a>
+      <h2>GET</h2>
       <p>
-            Adds property to the given entity id
+            Fetch the complete definition of an entity given its GUID.
           </p>
       <h3>Parameters</h3>
       <table>
@@ -206,27 +245,11 @@ unique attribute for the give type.
         <tr>
           <td>guid</td>
           <td>
-            entity id
+            GUID for the entity
           </td>
           <td>path</td>
           <td></td>
         </tr>
-        <tr>
-          <td>property</td>
-          <td>
-            property to add
-          </td>
-          <td>query</td>
-          <td></td>
-        </tr>
-        <tr>
-          <td>value</td>
-          <td>
-            property's value
-          </td>
-          <td>query</td>
-          <td></td>
-        </tr>
       </table>
       <h3>Response Body</h3>
       <table>
@@ -239,7 +262,7 @@ unique attribute for the give type.
           <td>application/json</td>
         </tr>
       </table>
-      <p>response payload as json</p>
+      <p>(no documentation provided)</p>
         <a name="path__entities_-guid-_traits.html"></a>
       <h1>/entities/{guid}/traits</h1>
       <a name="GET"></a>
@@ -354,6 +377,62 @@ unique attribute for the give type.
         </tr>
       </table>
       <p>(no documentation provided)</p>
+        <a name="path__entities_qualifiedName.html"></a>
+      <h1>/entities/qualifiedName</h1>
+      <a name="POST"></a>
+      <h2>POST</h2>
+      <p>
+            Adds/Updates given entity identified by its unique attribute( 
entityType, attributeName and value)
+Updates support only partial update of an entity - Adds/updates any new values 
specified
+Updates do not support removal of attribute values
+          </p>
+      <h3>Parameters</h3>
+      <table>
+        <tr>
+          <th>name</th>
+          <th>description</th>
+          <th>type</th>
+          <th>default</th>
+        </tr>
+        <tr>
+          <td>type</td>
+          <td>
+            the entity type
+          </td>
+          <td>query</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>property</td>
+          <td>
+            the unique attribute used to identify the entity
+          </td>
+          <td>query</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>value</td>
+          <td>
+            the unique attributes value
+          </td>
+          <td>query</td>
+          <td></td>
+        </tr>
+      </table>
+      <h3>Response Body</h3>
+      <table>
+        <tr>
+          <td align="right">element:</td>
+          <td>(custom)</td>
+        </tr>
+        <tr>
+          <td align="right">media types:</td>
+          <td>application/json</td>
+        </tr>
+      </table>
+      <p>response payload as json
+The body contains the JSONArray of entity json. The service takes care of 
de-duping the entities based on any
+unique attribute for the give type.</p>
 
       <div class="clear" />
     </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 8a68e26..0d72f9f 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Data Governance and Metadata framework for 
Hadoop</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>
@@ -248,7 +248,8 @@
 <li><a href="./Notification-Entity.html">Entity Notification</a></li></ul></li>
 <li>Bridges
 <ul>
-<li><a href="./Bridge-Hive.html">Hive Bridge</a></li></ul></li></ul></div>
+<li><a href="./Bridge-Hive.html">Hive Bridge</a></li></ul></li>
+<li><a href="./HighAvailability.html">Fault Tolerance And High Availability 
Options</a></li></ul></div>
 <div class="section">
 <h3><a name="API_Documentation"></a>API Documentation</h3>
 <p></p>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 991a458..553c6ae 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Issue Tracking</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index 0fd71ca..e0de929 100644
--- a/license.html
+++ b/license.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Project License</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/5058c744/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index e89f383..8641d10 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at 2015-12-07
+ | Generated by Apache Maven Doxia at 2015-12-30
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20151207" />
+    <meta name="Date-Revision-yyyymmdd" content="20151230" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Atlas &#x2013; Project Mailing Lists</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -183,8 +183,8 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-07</li> <li class="divider pull-right">|</li>
-              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating-SNAPSHOT</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2015-12-30</li> <li class="divider pull-right">|</li>
+              <li id="projectVersion" class="pull-right">Version: 
0.6-incubating</li>
             
                             </ul>
       </div>


Reply via email to