You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/03/27 13:07:50 UTC

[1/2] trafodion git commit: [TRAFODION-2986] minor issues in adoc found during mvn site

Repository: trafodion
Updated Branches:
  refs/heads/master 7430ca834 -> 53f89e6dc


[TRAFODION-2986] minor issues in adoc found during mvn site


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

Branch: refs/heads/master
Commit: b6157d5fa11688c0c8a1a26d574d479eb376988d
Parents: 5339170
Author: Liu Ming <ov...@sina.com>
Authored: Sun Mar 25 21:48:20 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Sun Mar 25 21:48:20 2018 +0000

----------------------------------------------------------------------
 .../src/asciidoc/_chapters/ambari_install.adoc            |  4 ++--
 .../src/asciidoc/_chapters/introduction.adoc              | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/b6157d5f/docs/provisioning_guide/src/asciidoc/_chapters/ambari_install.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/ambari_install.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/ambari_install.adoc
index fee825e..2d6e65f 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/ambari_install.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/ambari_install.adoc
@@ -124,7 +124,7 @@ Upgrade the traf_ambari package and re-start ambari-server service.
 
  $ sudo ambari-server restart
 
-==== Upgrade Entire HDP Stack
+=== Upgrade Entire HDP Stack
 
 Ambari requires version upgrades to be an entire stack, not single components. If you want to
 include a trafodion upgrade in entire stack version upgrade, first upgrade the traf_ambari
@@ -134,7 +134,7 @@ Once that is done, proceed with the upgrade following Ambari instructions. Be su
 define the Trafodion-2.2 URL that points to a repo server with the new apache-trafodion_server
 package.
 
-==== Upgrade Only Trafodion
+=== Upgrade Only Trafodion
 
 In this case, Ambari will not upgrade a single component, so the apache-trafodion_server
 package must be installed on each node directly (via yum command). Once that is done, the

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b6157d5f/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
index b16eea3..f253307 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -265,12 +265,20 @@ and for the Distribution Manager. Therefore, we recommend that you secure the fi
 that matches the security policies of your organization.
 
 ==== Example: Quick start using a {project-name} Configuration File
-The {project-name} Installer supports a minimum configuration to quick start your installation in two steps.
+The {project-name} Installer supports a minimum configuration to quick start your installation in two steps:
+
 1. Copy {project-name} server binary file to your installer directory.
++
+*Example*
++
 ```
 cp /path/to/apache-trafodion_server-2.2.0-RH-x86_64.tar.gz python-installer/
 ```
+
 2. Modify configuration file `my_config`, add the Hadoop Distribution Manager URL in `mgr_url`.
++
+*Example*
++
 ```
 mgr_url = 192.168.0.1:8080
 ```


[2/2] trafodion git commit: merge [TRAFODION-2986]

Posted by li...@apache.org.
merge [TRAFODION-2986] 


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/53f89e6d
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/53f89e6d
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/53f89e6d

Branch: refs/heads/master
Commit: 53f89e6dcf2e8e9475261edff8bbc516704796c8
Parents: 7430ca8 b6157d5
Author: Liu Ming <ov...@sina.com>
Authored: Tue Mar 27 07:54:06 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Tue Mar 27 07:54:06 2018 +0000

----------------------------------------------------------------------
 .../src/asciidoc/_chapters/ambari_install.adoc            |  4 ++--
 .../src/asciidoc/_chapters/introduction.adoc              | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------