You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tephra.apache.org by ch...@apache.org on 2016/06/21 23:41:26 UTC
incubator-tephra git commit: - Updated the logo - Added a
Presentations page
Repository: incubator-tephra
Updated Branches:
refs/heads/site 1047fad6b -> 124480dd2
- Updated the logo
- Added a Presentations page
Project: http://git-wip-us.apache.org/repos/asf/incubator-tephra/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tephra/commit/124480dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tephra/tree/124480dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tephra/diff/124480dd
Branch: refs/heads/site
Commit: 124480dd239f37fcd592e1f28303eb296d616806
Parents: 1047fad
Author: Terence Yim <te...@cask.co>
Authored: Tue Jun 21 16:41:19 2016 -0700
Committer: Terence Yim <te...@cask.co>
Committed: Tue Jun 21 16:41:19 2016 -0700
----------------------------------------------------------------------
src/site/markdown/Presentations.md | 28 +++++++++++++++++++++
src/site/markdown/index.md | 3 +--
src/site/resources/images/tephra_logotype.png | Bin 12676 -> 5382 bytes
src/site/site.xml | 1 +
4 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/124480dd/src/site/markdown/Presentations.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Presentations.md b/src/site/markdown/Presentations.md
new file mode 100644
index 0000000..ac6912c
--- /dev/null
+++ b/src/site/markdown/Presentations.md
@@ -0,0 +1,28 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<head>
+ <title>Presentations</title>
+</head>
+
+### ACID Transactions in Apache Phoenix with Apache Tephra
+<iframe src="http://www.slideshare.net/slideshow/embed_code/key/D6S5HjMQqa76Fb" width="510" height="420" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen="true"> </iframe>
+
+### Transactions Over Apache HBase
+<iframe src="http://www.slideshare.net/slideshow/embed_code/key/2uZHDOcB0nTIPf" width="510" height="420" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen="true"> </iframe>
+
http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/124480dd/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 7247389..22774b3 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -73,8 +73,7 @@ transaction that the cell is associated with failed or a write from a newer tran
successfully committed to the same column.
More details on how Tephra transactions work and the interactions between these components can be
-found in our [Transactions over HBase](http://www.slideshare.net/alexbaranau/transactions-over-hbase)
-presentation.
+found in our [Presentations](Presentations.html).
## Is It Building?
Status of CI build at Travis CI: [](https://travis-ci.org/apache/incubator-tephra)
http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/124480dd/src/site/resources/images/tephra_logotype.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/tephra_logotype.png b/src/site/resources/images/tephra_logotype.png
index bfcd174..fd02cdc 100644
Binary files a/src/site/resources/images/tephra_logotype.png and b/src/site/resources/images/tephra_logotype.png differ
http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/124480dd/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 538c139..9d601cd 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -50,6 +50,7 @@
<menu name="Documentation">
<item name="Home" href="./index.html"/>
<item name="Getting Started" href="./GettingStarted.html"/>
+ <item name="Presentations" href="./Presentations.html"/>
<item name="API (0.9.0-incubating-SNAPSHOT)" href="./apidocs/index.html"/>
<item name="API (0.8.0-incubating)" href="./apidocs-0.8.0-incubating/index.html"/>
</menu>