You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jr...@apache.org on 2017/03/14 20:26:25 UTC

[1/2] incubator-impala git commit: [DOCS] Genericize admission_config_noncm page

Repository: incubator-impala
Updated Branches:
  refs/heads/master 16e2974fb -> fa1361b86


[DOCS] Genericize admission_config_noncm page

A couple of fleeting / invisible references to 'cm'.
Take 'em out to avoid false positives in our grep reports.

Change-Id: Ia510a1eb53eba2f1127f57fa1f8bfe39525e0613
Reviewed-on: http://gerrit.cloudera.org:8080/6391
Reviewed-by: Laurel Hale <la...@cloudera.com>
Reviewed-by: John Russell <jr...@cloudera.com>
Tested-by: Impala Public Jenkins


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

Branch: refs/heads/master
Commit: c19eb4f1942d5fd190b0671fc335de73101c79da
Parents: 16e2974
Author: John Russell <jr...@cloudera.com>
Authored: Tue Mar 14 11:02:44 2017 -0700
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Tue Mar 14 20:18:55 2017 +0000

----------------------------------------------------------------------
 docs/topics/impala_admission.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/c19eb4f1/docs/topics/impala_admission.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_admission.xml b/docs/topics/impala_admission.xml
index 76002e0..f1359cf 100644
--- a/docs/topics/impala_admission.xml
+++ b/docs/topics/impala_admission.xml
@@ -484,7 +484,6 @@ under the License.
                 <codeph>""</codeph> (empty string, meaning unlimited) </p>
             </dd>
           </dlentry>
-          <!-- Possibly from here on down, command-line controls not applicable to CM. -->
           <dlentry id="disable_admission_control">
             <dt>
               <codeph>disable_admission_control</codeph>
@@ -573,7 +572,7 @@ under the License.
       </section>
     </conbody>
 
-    <concept id="admission_config_noncm">
+    <concept id="admission_config_manual">
 
       <title>Configuring Admission Control Using the Command Line</title>
 
@@ -639,7 +638,6 @@ impala.admission-control.pool-queue-timeout-ms.<varname>queue_name</varname></ph
     </concept>
 
     <concept id="admission_examples">
-    <!-- Pruning the CM examples and screenshots because in Impala 2.5 the defaults match up much better with our recommendations. -->
 
       <title>Example of Admission Control Configuration</title>
 


[2/2] incubator-impala git commit: [DOCS] Genericize cdh_sg_component_kms link

Posted by jr...@apache.org.
[DOCS] Genericize cdh_sg_component_kms link

Re-enable an xref that was conditionalized out,
but make it produce plaintext instead of a link.

Change-Id: I11fcac18533ea07ef03013034d246b8273882c96
Reviewed-on: http://gerrit.cloudera.org:8080/6396
Reviewed-by: Laurel Hale <la...@cloudera.com>
Reviewed-by: John Russell <jr...@cloudera.com>
Tested-by: Impala Public Jenkins


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

Branch: refs/heads/master
Commit: fa1361b86165b49fbb9de2fac9c53c4056a628c5
Parents: c19eb4f
Author: John Russell <jr...@cloudera.com>
Authored: Tue Mar 14 12:42:45 2017 -0700
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Tue Mar 14 20:20:41 2017 +0000

----------------------------------------------------------------------
 docs/impala_keydefs.ditamap         | 3 +++
 docs/topics/impala_new_features.xml | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/fa1361b8/docs/impala_keydefs.ditamap
----------------------------------------------------------------------
diff --git a/docs/impala_keydefs.ditamap b/docs/impala_keydefs.ditamap
index 0c41dcc..ca0be37 100644
--- a/docs/impala_keydefs.ditamap
+++ b/docs/impala_keydefs.ditamap
@@ -204,6 +204,9 @@ under the License.
   <keydef href="" scope="external" format="html" keys="cdh_sg_cdh5_hadoop_security">
     <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
   </keydef>
+  <keydef href="" scope="external" format="html" keys="cdh_sg_component_kms">
+    <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
+  </keydef>
   <keydef href="" scope="external" format="html" keys="cdh_sg_hive_security">
     <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
   </keydef>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/fa1361b8/docs/topics/impala_new_features.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_new_features.xml b/docs/topics/impala_new_features.xml
index 0c80447..482fa12 100644
--- a/docs/topics/impala_new_features.xml
+++ b/docs/topics/impala_new_features.xml
@@ -1864,9 +1864,9 @@ under the License.
              integrated build where the topic is available for link resolution. -->
           <p>
             Improved support for HDFS encryption. The <codeph>LOAD DATA</codeph> statement now works when the
-            source directory and destination table are in different encryption zones. <ph audience="integrated"><ph audience="PDF">See
-            <xref href="cdh_sg_component_kms.xml#impala_encryption"/> for details about using HDFS encryption with
-            Impala.</ph></ph>
+            source directory and destination table are in different encryption zones. See
+            <xref keyref="cdh_sg_component_kms"/> for details about using HDFS encryption with
+            Impala.
           </p>
         </li>