You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@twill.apache.org by ch...@apache.org on 2015/07/31 01:31:01 UTC
[1/2] incubator-twill git commit: Added guide on how to merge code.
Repository: incubator-twill
Updated Branches:
refs/heads/site 79c1dcf11 -> 75cb0a285
Added guide on how to merge code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/48f8be4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/48f8be4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/48f8be4c
Branch: refs/heads/site
Commit: 48f8be4c20e0c4df9a9f8856222bef2661845852
Parents: 79c1dcf
Author: Terence Yim <ch...@apache.org>
Authored: Thu Jul 30 13:27:33 2015 -0700
Committer: Terence Yim <ch...@apache.org>
Committed: Thu Jul 30 13:59:22 2015 -0700
----------------------------------------------------------------------
src/site/markdown/HowToContribute.md | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/48f8be4c/src/site/markdown/HowToContribute.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/HowToContribute.md b/src/site/markdown/HowToContribute.md
index a51393b..eacbd9b 100644
--- a/src/site/markdown/HowToContribute.md
+++ b/src/site/markdown/HowToContribute.md
@@ -48,4 +48,24 @@ these steps to get your contributions in:
5. Please prefix your pull request title with the JIRA issue ID; for example, `(TWILL-87) Adding container placement policy`.
6. Please complete the pull request description with additional details as appropriate.
7. Once sent, code review will be done through the pull request.
-8. Once all review issues are resolved, we will merge the changes into the `master` branch of the Apache Twill repo.
\ No newline at end of file
+8. Once all review issues are resolved, we will merge the changes into the `master` branch of the Apache Twill repo.
+
+### How to Merge Code Changes
+
+Committer can merge code changes that are already reviewed into the `master` branch with the following steps:
+
+1. Make sure the GitHub pull request is squashed into one commit. If not, ask the patch contributor to help doing so.
+
+2. Download the patch file from GitHub. You can append `.patch` to the end of the GitHub pull request URL to get the patch file.
+
+ curl -L -O https://github.com/apache/incubator-twill/pull/${PR_NUMBER}.patch
+3. Edit the patch file and add the following line in the commit message for closing the pull request.
+
+ This closes #${PR_NUMBER} from GitHub.
+4. Apply the patch and push it back to remote repo. Make sure you apply it on the latest `master` branch.
+
+ git checkout master
+ git pull origin master
+ git am --signoff < ${PR_NUMBER}
+ git push origin master
+5. Close the JIRA issue associated with the patch.
\ No newline at end of file
[2/2] incubator-twill git commit: Use different skin for the Twill
site.
Posted by ch...@apache.org.
Use different skin for the Twill site.
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/75cb0a28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/75cb0a28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/75cb0a28
Branch: refs/heads/site
Commit: 75cb0a285f666fd728bc7e921f6e750abc989037
Parents: 48f8be4
Author: Terence Yim <ch...@apache.org>
Authored: Thu Jul 30 16:30:51 2015 -0700
Committer: Terence Yim <ch...@apache.org>
Committed: Thu Jul 30 16:30:51 2015 -0700
----------------------------------------------------------------------
pom.xml | 10 +++++++
src/site/markdown/GettingStarted.md | 8 ++++--
src/site/site.xml | 47 +++++++++++++++++---------------
3 files changed, 40 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/75cb0a28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 50ed89c..8ee3a9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,6 +340,16 @@
<artifactId>doxia-module-markdown</artifactId>
<version>1.6</version>
</dependency>
+ <dependency>
+ <groupId>lt.velykis.maven.skins</groupId>
+ <artifactId>reflow-velocity-tools</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
</dependencies>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/75cb0a28/src/site/markdown/GettingStarted.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/GettingStarted.md b/src/site/markdown/GettingStarted.md
index 4b8930f..68506a4 100644
--- a/src/site/markdown/GettingStarted.md
+++ b/src/site/markdown/GettingStarted.md
@@ -170,7 +170,8 @@ You can run the HelloWorld application from any node of the Hadoop cluster using
(be sure to add your ZooKeeper Host and Port):
```sh
-$ CP=twill-examples-yarn-0.5.0-incubating-SNAPSHOT.jar:`hadoop classpath`; java -cp $CP org.apache.twill.example.yarn.HelloWorld {zookeeper_host:port}
+$ export CP=twill-examples-yarn-0.5.0-incubating-SNAPSHOT.jar:`hadoop classpath`
+$ java -cp $CP org.apache.twill.example.yarn.HelloWorld {zookeeper_host:port}
```
If successful, you should see logs output to the terminal with details of the running application. Once the application
@@ -192,8 +193,9 @@ You can run the BundleJarExample application from any node of the Hadoop cluster
(be sure to add your ZooKeeper Host and Port):
```sh
-$ CP=twill-examples-yarn-0.5.0-incubating-SNAPSHOT.jar:`hadoop classpath`;
- java -cp $CP org.apache.twill.example.yarn.BundledJarExample {zookeeper_host:port} twill-examples-echo-0.5.0-incubating-SNAPSHOT.jar echo.EchoMain arg1
+$ export CP=twill-examples-yarn-0.5.0-incubating-SNAPSHOT.jar:`hadoop classpath`
+$ java -cp $CP org.apache.twill.example.yarn.BundledJarExample {zookeeper_host:port} \
+ twill-examples-echo-0.5.0-incubating-SNAPSHOT.jar echo.EchoMain arg1
```
Like with the HelloWorld example, you should see logs output to the terminal. Once the application is complete, check
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/75cb0a28/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index e807013..e35dba2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,7 +21,7 @@
<bannerLeft>
<name>Apache Twill</name>
<src>images/ApacheTwill_logo.png</src>
- <href>http://twill.incubator.apache.org/</href>
+ <href>http://twill.incubator.apache.org/index.html</href>
<alt>Apache Twill</alt>
</bannerLeft>
<bannerRight>
@@ -34,20 +34,23 @@
<publishDate position="none"/>
<version position="none"/>
+ <!--<skin>-->
+ <!--<groupId>org.apache.maven.skins</groupId>-->
+ <!--<artifactId>maven-fluido-skin</artifactId>-->
+ <!--<version>1.3.1</version>-->
+ <!--</skin>-->
<skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <groupId>lt.velykis.maven.skins</groupId>
+ <artifactId>reflow-maven-skin</artifactId>
+ <version>1.1.1</version>
</skin>
<body>
-
<breadcrumbs position="left">
- <item name="Apache Twill" href="http://twill.incubator.apache.org/"/>
+ <item name="Apache Twill" href="http://twill.incubator.apache.org/index.html"/>
</breadcrumbs>
- <menu name="Apache Twill">
- <item name="Introduction" href="./index.html"/>
+ <menu name="Documentation">
<item name="Getting Started" href="./GettingStarted.html"/>
<item name="API (0.7.0-incubating-SNAPSHOT)" href="./apidocs/index.html"/>
<item name="API (0.6.0-incubating)" href="./apidocs-0.6.0-incubating/index.html"/>
@@ -81,25 +84,25 @@
</menu>
<footer>
- <div class="row span16" style="margin-bottom: 20px">
- <div>
- Apache Twill, Apache, the Apache feather logo,
- and the Apache Twill project logos are trademarks of The Apache Software Foundation.
- All other marks mentioned may be trademarks or registered trademarks of their respective owners.
- </div>
+ <div>
+ Apache Twill, Apache, the Apache feather logo,
+ and the Apache Twill project logos are trademarks of The Apache Software Foundation.
+ All other marks mentioned may be trademarks or registered trademarks of their respective owners.
</div>
</footer>
</body>
<custom>
- <fluidoSkin>
- <profile>production</profile>
- <topBarEnabled>true</topBarEnabled>
- <navBarStyle>navbar-inverse</navBarStyle>
- <sideBarEnabled>true</sideBarEnabled>
- <leftColumnClass>span2</leftColumnClass>
- <bodyColumnClass>span10</bodyColumnClass>
- </fluidoSkin>
+ <reflowSkin>
+ <theme>bootswatch-flatly</theme>
+ <smoothScroll>true</smoothScroll>
+ <bottomNav maxSpan="9" >
+ <column>Documentation</column>
+ <column>Releases</column>
+ <column>Get Involved</column>
+ <column>ASF</column>
+ </bottomNav>
+ </reflowSkin>
</custom>
</project>