ATLAS-915 Fix docs for import-hive changes (svimal2106 via sumasai)

docs/src/site/twiki/Bridge-Hive.twiki

@@ -21,20 +21,27 @@ The entities are created and de-duped using unique qualified name. They provide
 
 
 ---++ Importing Hive Metadata
-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 hive-site.xml and set environment variable $HIVE_CONF_DIR to the hive conf directory:
-  <verbatim>
-    <property>
-      <name>atlas.cluster.name</name>
-      <value>primary</value>
-    </property>
-  </verbatim>
+org.apache.atlas.hive.bridge.HiveMetaStoreBridge imports the Hive metadata into Atlas using the model defined in org.apache.atlas.hive.model.HiveDataModelGenerator.
 
-Usage: <atlas package>/bin/import-hive.sh. The logs are in <atlas package>/logs/import-hive.log
+import-hive.sh command can be used to facilitate this.
+The script needs Hadoop and Hive classpath jars.
 
-If you you are importing metadata in a kerberized cluster you need to run the command like this:
+  * For Hadoop jars, please make sure that the environment variable HADOOP_CLASSPATH is set. Another way is to set HADOOP_HOME to point to root directory of your Hadoop installation
 
+  * Similarly, for Hive jars, set HIVE_HOME to the root of Hive installation
+
+  * Set environment variable HIVE_CONF_DIR to Hive configuration directory
+
+    <verbatim>
+    Usage: <atlas package>/bin/import-hive.sh
+    </verbatim>
+
+The logs are in <atlas package>/logs/import-hive.log
+
+If you you are importing metadata in a kerberized cluster you need to run the command like this:
+<verbatim>
 <atlas package>/bin/import-hive.sh -Dsun.security.jgss.debug=true -Djavax.security.auth.useSubjectCredsOnly=false -Djava.security.krb5.conf=[krb5.conf location] -Djava.security.auth.login.config=[jaas.conf location]
+</verbatim>
    * krb5.conf is typically found at /etc/krb5.conf
    * for details about jaas.conf and a suggested location see the [[security][atlas security documentation]]
 

release-log.txt

@@ -3,6 +3,8 @@ Apache Atlas Release Notes
 
 --trunk - unreleased
 INCOMPATIBLE CHANGES:
+ATLAS-915 Fix docs for import-hive changes (svimal2106 via sumasai)
+ATLAS-688 import-hive should depend on Hive CLASSPATH jars instead of packaging everything (svimal2106 via sumasai)
 ATLAS-835 Falcon Integration with Atlas (sowmyaramesh via shwethags)
 ATLAS-912 Update to use Kafka 0.10.0.0 (from 0.9.0.0) (madhan.neethiraj via yhemanth)
 ATLAS-542 Make qualifiedName and name consistent across all Datasets and Process (sumasai via yhemanth)
@@ -28,7 +30,6 @@ ALL CHANGES:
 ATLAS-725 UI : Filter out or highlight deleted entities in search result outputs(dsl, text) , schema view, and lineage graph (kevalbhatt18 via sumasai)
 ATLAS-897 Atlas UI: Feature to associate multiple assets with a term. (kevalbhatt18 via sumasai)
 ATLAS-866 Improve association of terms with entity (Show tree view) (kevalbhatt18 via sumasai)
-ATLAS-688 import-hive should depend on Hive CLASSPATH jars instead of packaging everything (svimal2106 via sumasai)
 ATLAS-877 CreateTime of an entity(for example hive table) changes for every update (sumasai)
 ATLAS-642 import-hive should create the lineage for external tables (svimal2106 via sumasai)
 ATLAS-901 Log messages that cannot be sent to Kafka to a specific log configuration (yhemanth)