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/01/18 20:12:38 UTC

incubator-impala git commit: Improve substitution variables.

Repository: incubator-impala
Updated Branches:
  refs/heads/master 8377b9949 -> 7d9e76620


Improve substitution variables.

Fix the version numbers that show up in titles
and in lead-ins, e.g. "____ or higher only", to
reflect purely Impala release numbers.

Substitute the most prevalent forms of reference
to CDH and Cloudera support with generic equivalents.

Resolved merge conflict with the code review to reorg
all the keydefs into a separate file.

Change-Id: Ia23b96a8344e6430528701b81bea7eaaccc72b18
Reviewed-on: http://gerrit.cloudera.org:8080/5661
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/7d9e7662
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/7d9e7662
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/7d9e7662

Branch: refs/heads/master
Commit: 7d9e76620743cced2c09e03cbc7ee9e4b4d7380b
Parents: 8377b99
Author: John Russell <jr...@cloudera.com>
Authored: Wed Jan 18 11:54:49 2017 -0800
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Wed Jan 18 20:05:53 2017 +0000

----------------------------------------------------------------------
 docs/impala_keydefs.ditamap | 46 +++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/7d9e7662/docs/impala_keydefs.ditamap
----------------------------------------------------------------------
diff --git a/docs/impala_keydefs.ditamap b/docs/impala_keydefs.ditamap
index 952430a..bee6672 100644
--- a/docs/impala_keydefs.ditamap
+++ b/docs/impala_keydefs.ditamap
@@ -630,32 +630,30 @@ https://issues.cloudera.org/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=p
   <keydef href="https://issues.cloudera.org/browse/IMPALA-995" scope="external" format="html" keys="IMPALA-995"/>
 
 <!-- Short form of mapping from Impala release to vendor-specific releases, for use in headings. -->
-  <keydef keys="impala28"><topicmeta><keywords><keyword>CDH 5.10</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala27"><topicmeta><keywords><keyword>CDH 5.9</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala26"><topicmeta><keywords><keyword>CDH 5.8</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala25"><topicmeta><keywords><keyword>CDH 5.7</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala24"><topicmeta><keywords><keyword>CDH 5.6</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala23"><topicmeta><keywords><keyword>CDH 5.5</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala22"><topicmeta><keywords><keyword>CDH 5.4</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala21"><topicmeta><keywords><keyword>CDH 5.3</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala20"><topicmeta><keywords><keyword>CDH 5.2</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala14"><topicmeta><keywords><keyword>CDH 5.1</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala13"><topicmeta><keywords><keyword>CDH 5.0</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala12"><topicmeta><keywords><keyword>CDH 5.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala28"><topicmeta><keywords><keyword>Impala 2.8</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala27"><topicmeta><keywords><keyword>Impala 2.7</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala26"><topicmeta><keywords><keyword>Impala 2.6</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala25"><topicmeta><keywords><keyword>Impala 2.5</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala24"><topicmeta><keywords><keyword>Impala 2.4</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala23"><topicmeta><keywords><keyword>Impala 2.3</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala22"><topicmeta><keywords><keyword>Impala 2.2</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala21"><topicmeta><keywords><keyword>Impala 2.1</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala20"><topicmeta><keywords><keyword>Impala 2.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala14"><topicmeta><keywords><keyword>Impala 1.4</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala13"><topicmeta><keywords><keyword>Impala 1.3</keyword></keywords></topicmeta></keydef>
 
 <!-- Short form of mapping from Impala release to vendor-specific releases, for use in running text. -->
-  <keydef keys="impala28_full"><topicmeta><keywords><keyword>CDH 5.10 / Impala 2.8</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala27_full"><topicmeta><keywords><keyword>CDH 5.9 / Impala 2.7</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala26_full"><topicmeta><keywords><keyword>CDH 5.8 / Impala 2.6</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala25_full"><topicmeta><keywords><keyword>CDH 5.7 / Impala 2.5</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala24_full"><topicmeta><keywords><keyword>CDH 5.6 / Impala 2.4</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala23_full"><topicmeta><keywords><keyword>CDH 5.5 / Impala 2.3</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala22_full"><topicmeta><keywords><keyword>CDH 5.4 / Impala 2.2</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala21_full"><topicmeta><keywords><keyword>CDH 5.3 / Impala 2.1</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala20_full"><topicmeta><keywords><keyword>CDH 5.2 / Impala 2.0</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala14_full"><topicmeta><keywords><keyword>CDH 5.1 / Impala 1.4</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala13_full"><topicmeta><keywords><keyword>CDH 5.0 / Impala 1.3</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala12_full"><topicmeta><keywords><keyword>CDH 5.0 / Impala 1.2</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala28_full"><topicmeta><keywords><keyword>Impala 2.8</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala27_full"><topicmeta><keywords><keyword>Impala 2.7</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala26_full"><topicmeta><keywords><keyword>Impala 2.6</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala25_full"><topicmeta><keywords><keyword>Impala 2.5</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala24_full"><topicmeta><keywords><keyword>Impala 2.4</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala23_full"><topicmeta><keywords><keyword>Impala 2.3</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala22_full"><topicmeta><keywords><keyword>Impala 2.2</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala21_full"><topicmeta><keywords><keyword>Impala 2.1</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala20_full"><topicmeta><keywords><keyword>Impala 2.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala14_full"><topicmeta><keywords><keyword>Impala 1.4</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala13_full"><topicmeta><keywords><keyword>Impala 1.3</keyword></keywords></topicmeta></keydef>
 
 <!-- Indirect addresses for all the impala*.xml files. The key is the ID of the first topic within each file. -->
   <keydef href="topics/impala_concepts.xml" keys="concepts"/>