You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2015/09/28 11:49:47 UTC

incubator-atlas git commit: ATLAS-196 Fix solr documentation (suma.shivaprasad via shwethags)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master c12ac955a -> 9828c973b


ATLAS-196 Fix solr documentation (suma.shivaprasad via shwethags)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/9828c973
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/9828c973
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/9828c973

Branch: refs/heads/master
Commit: 9828c973b50a270e6c325b6e79293d47c8a7a136
Parents: c12ac95
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Mon Sep 28 15:19:39 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Mon Sep 28 15:19:39 2015 +0530

----------------------------------------------------------------------
 docs/src/site/twiki/Configuration.twiki     | 8 ++++++++
 docs/src/site/twiki/InstallationSteps.twiki | 4 ++--
 release-log.txt                             | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9828c973/docs/src/site/twiki/Configuration.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/Configuration.twiki b/docs/src/site/twiki/Configuration.twiki
index db9d22a..48cf56e 100644
--- a/docs/src/site/twiki/Configuration.twiki
+++ b/docs/src/site/twiki/Configuration.twiki
@@ -49,6 +49,14 @@ atlas.graph.index.search.elasticsearch.local-mode=true
 atlas.graph.index.search.elasticsearch.create.sleep=2000
 </verbatim>
 
+---++++ Graph Search Index - Solr
+
+<verbatim>
+ atlas.graph.index.search.backend=solr5
+ atlas.graph.index.search.solr.mode=cloud
+ atlas.graph.index.search.solr.zookeeper-url=<the ZK quorum setup for solr as comma separated value> eg: 10.1.6.4:2181,10.1.6.5:2181
+</verbatim>
+
 ---+++ Hive Lineage Configs
 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.

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9828c973/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index ea81efe..1c31897 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -126,7 +126,7 @@ export METADATA_SERVER_OPTS="-Djava.awt.headless=true -Djava.security.krb5.realm
 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
 <verbatim>
-* Install solr if not already running. Versions of SOLR supported are 4.8.1 or 5.2.1.
+* Install solr if not already running. Version of SOLR supported is 5.2.1.
 
 * Start solr in cloud mode.
   SolrCloud mode uses a ZooKeeper Service as a highly available, central location for cluster management.
@@ -143,7 +143,7 @@ For configuring Titan to work with Solr, please follow the instructions below
   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=<'solr' for solr 4.8.1>/<'solr5' for solr 5.2.1>
+ atlas.graph.index.search.backend=solr5
  atlas.graph.index.search.solr.mode=cloud
  atlas.graph.index.search.solr.zookeeper-url=<the ZK quorum setup for solr as comma separated value> eg: 10.1.6.4:2181,10.1.6.5:2181
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9828c973/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 836db9c..e958a76 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
 ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
 
 ALL CHANGES:
+ATLAS-196 Fix solr documentation (suma.shivaprasad via shwethags)
 ATLAS-195 Document Hbase configs (suma.shivaprasad via shwethags)
 ATLAS-102 Issue with SolrIndex (suma.shivaprasad via shwethags)
 ATLAS-194 Thread pool in hive hook should be static (shwethags)