You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by am...@apache.org on 2016/05/25 17:36:21 UTC
[1/2] incubator-trafodion git commit: Removed carousel with
contributing companies since that's not allowed per the Apache standard.
Repository: incubator-trafodion
Updated Branches:
refs/heads/master d66659cd7 -> e9225d611
Removed carousel with contributing companies since that's not allowed per
the Apache standard.
Also, fixed errors in the provisioning guide regarding passwordless ssh.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fa89d605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fa89d605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fa89d605
Branch: refs/heads/master
Commit: fa89d605d040dafb8a2b907ca45075b95a80869b
Parents: d66659c
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Tue May 24 23:55:38 2016 -0600
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Tue May 24 23:55:38 2016 -0600
----------------------------------------------------------------------
.../src/asciidoc/_chapters/prepare.adoc | 2 ++
docs/src/site/markdown/index.md | 16 +++++++---------
docs/src/site/site.xml | 3 +--
pom.xml | 4 ++--
4 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fa89d605/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
index 86cea37..06752f0 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
@@ -67,6 +67,8 @@ cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
echo localhost $(cat /etc/ssh/ssh_host_rsa_key.pub) >> $HOME/.ssh/known_hosts
echo "NoHostAuthenticationForLocalhost=yes" >> $HOME/.ssh/config
chmod 600 $HOME/.ssh/config
+chmod 600 $HOME/.ssh/authorized_keys
+chmod 700 $HOME/.ssh/
```
After running these commands, do the following:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fa89d605/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
index 25fe90c..68b55a4 100644
--- a/docs/src/site/markdown/index.md
+++ b/docs/src/site/markdown/index.md
@@ -57,25 +57,23 @@ Trafodion provides SQL access to structured, semi-structured, and unstructured d
</td></tr></table>
-<center><h1>Contributing Companies</h1></center>
+<!-- 20160524 GTA Need more logos before using this part.
----
-
-<!-- Carousel with logos -->
+Powered by Trafodion
-#### Join Our Community
+#### Join the Trafodion Movement
![Slide 1](images/logo-carousel/slide-1.png)
-Code, test, present, document, web sites, and many other ways to contribute.
+Contribution opportunites: usage, code, tests, presentations, documentations, web sites, and things we didn't think of yet.
-#### Add Your Logo Here
+#### Powered By Trafodion
![Slide 2](images/logo-carousel/slide-2.png)
-Already a contributor? We need permission to add your company's logo here.
+Are you using Trafodion? We need permission to add your company's logo here.
----
+-->
## About
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fa89d605/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 3f3c7f8..50071d1 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -91,8 +91,7 @@
<sections>
<carousel />
<body />
- <carousel />
- <body />
+ <!--carousel /-->
<columns>2</columns>
<body />
</sections>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fa89d605/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9298358..f47754d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
</properties>
<modules>
- <module>docs/client_install</module>
+ <!--module>docs/client_install</module>
<module>dcs</module>
<module>core/rest</module>
<module>docs/command_interface</module>
@@ -143,7 +143,7 @@
<module>docs/odb_user</module>
<module>docs/spj_guide</module>
<module>docs/sql_reference</module>
- <module>docs/jdbct4ref_guide</module>
+ <module>docs/jdbct4ref_guide</module-->
</modules>
<build>
[2/2] incubator-trafodion git commit: Merge PR 500
Posted by am...@apache.org.
Merge PR 500
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e9225d61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e9225d61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e9225d61
Branch: refs/heads/master
Commit: e9225d6114f2ca72fd9f5c55033ff9f87ba470c1
Parents: d66659c fa89d60
Author: Amanda Moran <am...@apache.org>
Authored: Wed May 25 17:33:51 2016 +0000
Committer: Amanda Moran <am...@apache.org>
Committed: Wed May 25 17:33:51 2016 +0000
----------------------------------------------------------------------
.../src/asciidoc/_chapters/prepare.adoc | 2 ++
docs/src/site/markdown/index.md | 16 +++++++---------
docs/src/site/site.xml | 3 +--
pom.xml | 4 ++--
4 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------