You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by mw...@apache.org on 2016/06/29 14:48:48 UTC
[1/7] incubator-fluo-website git commit: Refactored people page and
added Garvit Bansal as a contributor
Repository: incubator-fluo-website
Updated Branches:
refs/heads/asf-site beff6f6fb -> db16e29d5
refs/heads/gh-pages 1b071da91 -> d255fc03a
Refactored people page and added Garvit Bansal as a contributor
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/d6ab6308
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/d6ab6308
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/d6ab6308
Branch: refs/heads/gh-pages
Commit: d6ab630855f2ef18a872dbbcde0e315e3081c3f1
Parents: 1b071da
Author: Mike Walch <mw...@gmail.com>
Authored: Tue Jun 28 17:18:35 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 09:53:43 2016 -0400
----------------------------------------------------------------------
pages/people.md | 34 ++++++++++++++++++----------------
stylesheets/fluo.scss | 2 +-
2 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/d6ab6308/pages/people.md
----------------------------------------------------------------------
diff --git a/pages/people.md b/pages/people.md
index 92b143d..30526df 100644
--- a/pages/people.md
+++ b/pages/people.md
@@ -8,30 +8,32 @@ permalink: /people/
## Committers
-| Username | Name | Organization | Timezone |
------------|-------------------|-----------------------------|----------|
-| cjnolet | Corey Nolet | [Tetra Concepts LLC][tc] | [ET][et] |
-| ctubbsii | Christopher Tubbs | | [ET][et] |
-| elserj | Josh Elser | [Hortonworks][hw] | [ET][et] |
-| kturner | Keith Turner | [Peterson Technologies][pt] | [ET][et] |
-| mwalch | Mike Walch | [Peterson Technologies][pt] | [ET][et] |
+| Name | Organization | Timezone |
+---------------------------------------------------|-----------------------------|----------|
+| [Corey Nolet](https://github.com/cjnolet) | [Tetra Concepts LLC][tc] | [ET][et] |
+| [Christopher Tubbs](https://github.com/ctubbsii) | | [ET][et] |
+| [Josh Elser](https://github.com/joshelser) | [Hortonworks][hw] | [ET][et] |
+| [Keith Turner](https://github.com/keith-turner) | [Peterson Technologies][pt] | [ET][et] |
+| [Mike Walch](https://github.com/mikewalch) | [Peterson Technologies][pt] | [ET][et] |
## Mentors
-| Username | Name | Organization | Timezone |
------------|-------------------|-----------------------------|----------|
-| billie | Billie Rinaldi | [Hortonworks][hw] | [ET][et] |
-| drew | Drew Farris | [Booz Allen Hamilton][bah] | [ET][et] |
-| elserj | Josh Elser | [Hortonworks][hw] | [ET][et] |
+| Name | Organization | Timezone |
+-----------------------------------------------------|----------------------------|----------|
+| [Billie Rinaldi](https://github.com/billierinaldi) | [Hortonworks][hw] | [ET][et] |
+| [Drew Farris](https://github.com/drewfarris) | [Booz Allen Hamilton][bah] | [ET][et] |
+| [Josh Elser](https://github.com/joshelser) | [Hortonworks][hw] | [ET][et] |
## Contributors
-| Username | Name | Organization | Timezone |
------------|-------------------|-----------------------------|----------|
-| ecn | Eric Newton | | [ET][et] |
+| Name | Organization | Timezone |
+------------------------------------------------|-------------------------------------|------------|
+| [Eric Newton](https://github.com/ericnewton) | | [ET][et] |
+| [Garvit Bansal](https://github.com/Garvit244) | [Flipkart](http://www.flipkart.com) | [IST][ist] |
[tc]: http://www.tetraconcepts.com/
[hw]: http://hortonworks.com/
[pt]: http://www.ptech-llc.com/
-[et]: http://www.timeanddate.com/time/zones/et
[bah]: http://www.boozallen.com/
+[et]: http://www.timeanddate.com/time/zones/et
+[ist]: http://www.timeanddate.com/time/zones/ist
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/d6ab6308/stylesheets/fluo.scss
----------------------------------------------------------------------
diff --git a/stylesheets/fluo.scss b/stylesheets/fluo.scss
index c87ad40..dff113d 100644
--- a/stylesheets/fluo.scss
+++ b/stylesheets/fluo.scss
@@ -85,7 +85,7 @@ p {
margin-left: 0px;
}
-tr:nth-child(even) {background: #DFEBF2}
+tr:nth-child(even) {background: #F3F3F3}
tr:nth-child(odd) {background: #FFF}
.highlight {
[6/7] incubator-fluo-website git commit: Merge branch 'repo-updates'
into gh-pages
Posted by mw...@apache.org.
Merge branch 'repo-updates' into gh-pages
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/d255fc03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/d255fc03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/d255fc03
Branch: refs/heads/gh-pages
Commit: d255fc03a1217ba67ca56b22cd60b3a198e31bf0
Parents: c01a076 83eba45
Author: Mike Walch <mw...@gmail.com>
Authored: Wed Jun 29 10:45:33 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:45:33 2016 -0400
----------------------------------------------------------------------
README.md | 14 +++++++-------
_scripts/convert-docs.py | 2 +-
_scripts/convert-recipes.py | 2 +-
apidocs/index.md | 4 ++--
docs/index.md | 4 ++--
pages/download.md | 4 ++--
pages/getinvolved.md | 8 ++++----
pages/how-to-contribute.md | 12 ++++++------
pages/release-process.md | 2 +-
9 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[4/7] incubator-fluo-website git commit: Jekyll build from
gh-pages:c01a076
Posted by mw...@apache.org.
Jekyll build from gh-pages:c01a076
Merge branch 'add-disclaimer' into gh-pages
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/07d50f57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/07d50f57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/07d50f57
Branch: refs/heads/asf-site
Commit: 07d50f5712a0e4bcf75ddce975095a8339e34ab7
Parents: beff6f6
Author: Mike Walch <mw...@gmail.com>
Authored: Wed Jun 29 10:43:19 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:43:19 2016 -0400
----------------------------------------------------------------------
feed.xml | 4 ++--
index.html | 10 +++++++++-
people/index.html | 35 ++++++++++++++---------------------
stylesheets/fluo.css | 2 +-
4 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/07d50f57/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 0131250..7c56e4b 100644
--- a/feed.xml
+++ b/feed.xml
@@ -5,8 +5,8 @@
<description></description>
<link>http://fluo.io/</link>
<atom:link href="http://fluo.io/feed.xml" rel="self" type="application/rss+xml" />
- <pubDate>Fri, 17 Jun 2016 14:33:51 -0400</pubDate>
- <lastBuildDate>Fri, 17 Jun 2016 14:33:51 -0400</lastBuildDate>
+ <pubDate>Wed, 29 Jun 2016 10:43:16 -0400</pubDate>
+ <lastBuildDate>Wed, 29 Jun 2016 10:43:16 -0400</lastBuildDate>
<generator>Jekyll v3.0.3</generator>
<item>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/07d50f57/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index bdfcd06..9a4e0c7 100644
--- a/index.html
+++ b/index.html
@@ -77,7 +77,7 @@
<h2 id="welcome-fluo"><b>Apache Fluo</b> lets users make incremental updates to large data sets stored in Apache Accumulo</h2>
</div>
<h2 style="padding-top: 0px">Overview</h2>
- <p>Apache Fluo is an open source implementation of <a href="https://research.google.com/pubs/pub36726.html" target="_blank">Percolator</a>
+ <p>Apache Fluo (incubating) is an open source implementation of <a href="https://research.google.com/pubs/pub36726.html" target="_blank">Percolator</a>
(which populates Google's search index) for <a href="https://accumulo.apache.org/" target="_blank">Apache Accumulo</a>. Fluo makes it possible to update the results of a large-scale computation, index, or analytic as new data is discovered.</p>
</div>
<div class="col-sm-4">
@@ -174,6 +174,14 @@
<p>The <a href="/docs/fluo-recipes/1.0.0-beta-2/">Fluo Recipes API</a> builds on the core API to offer complex transactional updates.</li>
</div>
</div>
+
+ <h2>Disclaimer</h2>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <p>Apache Fluo (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+ </div>
+ </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/07d50f57/people/index.html
----------------------------------------------------------------------
diff --git a/people/index.html b/people/index.html
index 963c731..89339bb 100644
--- a/people/index.html
+++ b/people/index.html
@@ -84,7 +84,6 @@
<table>
<thead>
<tr>
- <th>Username</th>
<th>Name</th>
<th>Organization</th>
<th>Timezone</th>
@@ -92,32 +91,27 @@
</thead>
<tbody>
<tr>
- <td>cjnolet</td>
- <td>Corey Nolet</td>
+ <td><a href="https://github.com/cjnolet">Corey Nolet</a></td>
<td><a href="http://www.tetraconcepts.com/">Tetra Concepts LLC</a></td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
<tr>
- <td>ctubbsii</td>
- <td>Christopher Tubbs</td>
+ <td><a href="https://github.com/ctubbsii">Christopher Tubbs</a></td>
<td>�</td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
<tr>
- <td>elserj</td>
- <td>Josh Elser</td>
+ <td><a href="https://github.com/joshelser">Josh Elser</a></td>
<td><a href="http://hortonworks.com/">Hortonworks</a></td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
<tr>
- <td>kturner</td>
- <td>Keith Turner</td>
+ <td><a href="https://github.com/keith-turner">Keith Turner</a></td>
<td><a href="http://www.ptech-llc.com/">Peterson Technologies</a></td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
<tr>
- <td>mwalch</td>
- <td>Mike Walch</td>
+ <td><a href="https://github.com/mikewalch">Mike Walch</a></td>
<td><a href="http://www.ptech-llc.com/">Peterson Technologies</a></td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
@@ -129,7 +123,6 @@
<table>
<thead>
<tr>
- <th>Username</th>
<th>Name</th>
<th>Organization</th>
<th>Timezone</th>
@@ -137,20 +130,17 @@
</thead>
<tbody>
<tr>
- <td>billie</td>
- <td>Billie Rinaldi</td>
+ <td><a href="https://github.com/billierinaldi">Billie Rinaldi</a></td>
<td><a href="http://hortonworks.com/">Hortonworks</a></td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
<tr>
- <td>drew</td>
- <td>Drew Farris</td>
+ <td><a href="https://github.com/drewfarris">Drew Farris</a></td>
<td><a href="http://www.boozallen.com/">Booz Allen Hamilton</a></td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
<tr>
- <td>elserj</td>
- <td>Josh Elser</td>
+ <td><a href="https://github.com/joshelser">Josh Elser</a></td>
<td><a href="http://hortonworks.com/">Hortonworks</a></td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
@@ -162,7 +152,6 @@
<table>
<thead>
<tr>
- <th>Username</th>
<th>Name</th>
<th>Organization</th>
<th>Timezone</th>
@@ -170,11 +159,15 @@
</thead>
<tbody>
<tr>
- <td>ecn</td>
- <td>Eric Newton</td>
+ <td><a href="https://github.com/ericnewton">Eric Newton</a></td>
<td>�</td>
<td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
</tr>
+ <tr>
+ <td><a href="https://github.com/Garvit244">Garvit Bansal</a></td>
+ <td><a href="http://www.flipkart.com">Flipkart</a></td>
+ <td><a href="http://www.timeanddate.com/time/zones/ist">IST</a></td>
+ </tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/07d50f57/stylesheets/fluo.css
----------------------------------------------------------------------
diff --git a/stylesheets/fluo.css b/stylesheets/fluo.css
index bb4a19d..7257027 100644
--- a/stylesheets/fluo.css
+++ b/stylesheets/fluo.css
@@ -2010,7 +2010,7 @@ p { line-height: 25px; padding-top: 9px; }
.text-muted { margin-left: 0px; }
-tr:nth-child(even) { background: #DFEBF2; }
+tr:nth-child(even) { background: #F3F3F3; }
tr:nth-child(odd) { background: #FFF; }
[2/7] incubator-fluo-website git commit: Adding incubation disclaimer
Posted by mw...@apache.org.
Adding incubation disclaimer
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/8345c5c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/8345c5c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/8345c5c3
Branch: refs/heads/gh-pages
Commit: 8345c5c39c48d36978411480a37a7ce0f1b94ed5
Parents: 1b071da
Author: Mike Walch <mw...@gmail.com>
Authored: Wed Jun 29 10:26:38 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:26:38 2016 -0400
----------------------------------------------------------------------
index.html | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/8345c5c3/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 34f32d6..54ea762 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@ html_title_override: true
<h2 id="welcome-fluo"><b>Apache Fluo</b> lets users make incremental updates to large data sets stored in Apache Accumulo</h2>
</div>
<h2 style="padding-top: 0px">Overview</h2>
- <p>Apache Fluo is an open source implementation of <a href="https://research.google.com/pubs/pub36726.html" target="_blank">Percolator</a>
+ <p>Apache Fluo (incubating) is an open source implementation of <a href="https://research.google.com/pubs/pub36726.html" target="_blank">Percolator</a>
(which populates Google's search index) for <a href="https://accumulo.apache.org/" target="_blank">Apache Accumulo</a>. Fluo makes it possible to update the results of a large-scale computation, index, or analytic as new data is discovered.</p>
</div>
<div class="col-sm-4">
@@ -74,4 +74,12 @@ html_title_override: true
<p>The <a href="{{ site.baseurl }}/docs/fluo-recipes/{{ site.latest_recipes_release }}/">Fluo Recipes API</a> builds on the core API to offer complex transactional updates.</li>
</div>
</div>
+
+ <h2>Disclaimer</h2>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <p>Apache Fluo (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+ </div>
+ </div>
</div>
[7/7] incubator-fluo-website git commit: Jekyll build from
gh-pages:d255fc0
Posted by mw...@apache.org.
Jekyll build from gh-pages:d255fc0
Merge branch 'repo-updates' into gh-pages
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/db16e29d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/db16e29d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/db16e29d
Branch: refs/heads/asf-site
Commit: db16e29d5118d942a476fb5b23b953d09b4bda98
Parents: 07d50f5
Author: Mike Walch <mw...@gmail.com>
Authored: Wed Jun 29 10:45:40 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:45:40 2016 -0400
----------------------------------------------------------------------
README.md | 14 +++++++-------
apidocs/index.html | 2 +-
docs/index.html | 2 +-
download/index.html | 4 ++--
feed.xml | 4 ++--
getinvolved/index.html | 4 ++--
how-to-contribute/index.html | 8 ++++----
release-process/index.html | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e871fbd..ab87b21 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Fluo website
============
-Code powering the Fluo project website ([https://fluo.incubator.apache.org](https://fluo.incubator.apache.org)).
+Code powering the Fluo project website ([https://fluo.apache.org](https://fluo.apache.org)).
Contributions
-------------
@@ -27,9 +27,9 @@ Below are the steps required to update the Fluo project website for a new releas
your Fluo repo to this repo:
```bash
- cd fluo-io.github.io
+ cd fluo-website/
mkdir -p docs/1.0.0-beta-1
- ./_scripts/convert-docs.py /path/to/fluo/docs/ /path/to/fluo-io.github.io/docs/fluo/1.0.0-beta-1/
+ ./_scripts/convert-docs.py /path/to/fluo/docs/ /path/to/fluo-website/docs/fluo/1.0.0-beta-1/
```
2. Modify `docs/index.md` to point to new release and update the `latest_fluo_release`
@@ -40,7 +40,7 @@ Below are the steps required to update the Fluo project website for a new releas
repo named after your release version (i.e 1.0.0-beta-1):
```bash
- ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo/modules/api /path/to/fluo-io.github.io/apidocs/fluo
+ ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo/modules/api /path/to/fluo-website/apidocs/fluo
```
4. Modify `apidocs/index.md` to point to the new javadocs that you just generated.
@@ -55,9 +55,9 @@ Steps to update website for new Fluo Recipes release:
1. Run the commands below to copy and convert documentation in your release tag.
```bash
- cd fluo-io.github.io
+ cd fluo-website
mkdir -p docs/1.0.0-beta-1
- ./_scripts/convert-recipes.py /path/to/fluo-recipes/docs/ /path/to/fluo-io.github.io/docs/fluo-recipes/1.0.0-beta-1/
+ ./_scripts/convert-recipes.py /path/to/fluo-recipes/docs/ /path/to/fluo-website/docs/fluo-recipes/1.0.0-beta-1/
```
2. Modify `docs/index.md` to point to new release and update the `latest_recipes_release` variable in `_config.yml`.
@@ -67,7 +67,7 @@ Steps to update website for new Fluo Recipes release:
repo named after your release version (i.e 1.0.0-beta-1):
```bash
- ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo-recipes /path/to/fluo-io.github.io/apidocs/fluo-recipes
+ ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo-recipes /path/to/fluo-website/apidocs/fluo-recipes
```
4. Modify `apidocs/index.md` to point to the new javadocs that you just generated.
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/apidocs/index.html
----------------------------------------------------------------------
diff --git a/apidocs/index.html b/apidocs/index.html
index aa43b91..25323e9 100644
--- a/apidocs/index.html
+++ b/apidocs/index.html
@@ -77,7 +77,7 @@
</header>
<article id="page-content">
- <p><a href="https://github.com/fluo-io/fluo">Fluo</a> and <a href="https://github.com/fluo-io/fluo-recipes">Fluo Recipes</a> have seperate API documentation as they are different repositories with their own release cycle.</p>
+ <p><a href="https://github.com/apache/fluo">Fluo</a> and <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a> have seperate API documentation as they are different repositories with their own release cycle.</p>
<ul>
<li>Fluo API documentation - <a href="/apidocs/fluo/1.0.0-beta-2/">Latest</a> | <a href="/apidocs/fluo/">Archive</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/docs/index.html
----------------------------------------------------------------------
diff --git a/docs/index.html b/docs/index.html
index 337b7a1..9d517ff 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -77,7 +77,7 @@
</header>
<article id="page-content">
- <p><a href="https://github.com/apache/incubator-fluo">Fluo</a> and <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a> have seperate documentation as they are different repositories with their own release cycle.</p>
+ <p><a href="https://github.com/apache/fluo">Fluo</a> and <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a> have seperate documentation as they are different repositories with their own release cycle.</p>
<h2 id="fluo">Fluo</h2>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/download/index.html
----------------------------------------------------------------------
diff --git a/download/index.html b/download/index.html
index 710e271..37c5e56 100644
--- a/download/index.html
+++ b/download/index.html
@@ -80,8 +80,8 @@
<p>Fluo tarball distributions are available on GitHub for download using the links below:</p>
<ul>
- <li><a href="https://github.com/apache/incubator-fluo/releases/latest">Latest Release</a></li>
- <li><a href="https://github.com/apache/incubator-fluo/releases">All Releases</a></li>
+ <li><a href="https://github.com/apache/fluo/releases/latest">Latest Release</a></li>
+ <li><a href="https://github.com/apache/fluo/releases">All Releases</a></li>
</ul>
<p>Before downloading a distribution, consider running Fluo using <a href="https://github.com/fluo-io/fluo-dev">fluo-dev</a> (which sets up Fluo for development)
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 7c56e4b..217c073 100644
--- a/feed.xml
+++ b/feed.xml
@@ -5,8 +5,8 @@
<description></description>
<link>http://fluo.io/</link>
<atom:link href="http://fluo.io/feed.xml" rel="self" type="application/rss+xml" />
- <pubDate>Wed, 29 Jun 2016 10:43:16 -0400</pubDate>
- <lastBuildDate>Wed, 29 Jun 2016 10:43:16 -0400</lastBuildDate>
+ <pubDate>Wed, 29 Jun 2016 10:45:37 -0400</pubDate>
+ <lastBuildDate>Wed, 29 Jun 2016 10:45:37 -0400</lastBuildDate>
<generator>Jekyll v3.0.3</generator>
<item>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/getinvolved/index.html
----------------------------------------------------------------------
diff --git a/getinvolved/index.html b/getinvolved/index.html
index 32324df..2856147 100644
--- a/getinvolved/index.html
+++ b/getinvolved/index.html
@@ -81,7 +81,7 @@
<h3 id="mailing-list">Mailing list</h3>
-<p>Join our public mailing list by sending an email to <code class="highlighter-rouge">dev-subscribe@fluo.incubator.apache.org</code>. Discussions regarding issues and pull requests should remain on our GitHub pages (<a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io">Fluo website</a>). Our email list is for announcing releases, organizing meet ups, or any discussion that does not make sense for GitHub.</p>
+<p>Join our public mailing list by sending an email to <code class="highlighter-rouge">dev-subscribe@fluo.incubator.apache.org</code>. Discussions regarding issues and pull requests should remain on our GitHub pages (<a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io">Fluo website</a>). Our email list is for announcing releases, organizing meet ups, or any discussion that does not make sense for GitHub.</p>
<h3 id="irc">IRC</h3>
@@ -92,7 +92,7 @@
<p>Users can provide feedback by:</p>
<ul>
- <li>Creating an issue on our GitHub pages: <a href="https://github.com/apache/incubator-fluo/issues">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io/issues">Fluo website</a></li>
+ <li>Creating an issue on our GitHub pages: <a href="https://github.com/apache/fluo/issues">Fluo</a>, <a href="https://github.com/apache/fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io/issues">Fluo website</a></li>
<li>Sending an email to our mailing list at <code class="highlighter-rouge">dev@fluo.incubator.apache.org</code></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/how-to-contribute/index.html
----------------------------------------------------------------------
diff --git a/how-to-contribute/index.html b/how-to-contribute/index.html
index 0ed530e..5fea7be 100644
--- a/how-to-contribute/index.html
+++ b/how-to-contribute/index.html
@@ -77,14 +77,14 @@
</header>
<article id="page-content">
- <p>Contributions are welcome to all Fluo repositories (<a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>) and the <a href="https://github.com/fluo-io/fluo-io.github.io">Fluo project website</a>. All repositories follow a <a href="http://www.apache.org/foundation/glossary.html#ReviewThenCommit">review-then-commit</a> process.
+ <p>Contributions are welcome to all Fluo repositories (<a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>) and the <a href="https://github.com/apache/incubator-fluo-website">Fluo project website</a>. All repositories follow a <a href="http://www.apache.org/foundation/glossary.html#ReviewThenCommit">review-then-commit</a> process.
This means that all contributions must pass any integration tests and be reviewed before being committed. Code reviews are done by commenting on a GitHub pull request.</p>
<h3 id="contribution-workflow">Contribution workflow</h3>
<ol>
- <li>Make sure you have a fork of the repository (<a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo-io/fluo-io.github.io">Fluo Website</a>) that you want contribute to.</li>
- <li>Create an issue that describes the work. Each Fluo repository has its own issue tracker: <a href="https://github.com/apache/incubator-fluo/issues">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/fluo-io/fluo-io.github.io/issues">Fluo Website</a></li>
+ <li>Make sure you have a fork of the repository (<a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/apache/incubator-fluo-website">Fluo Website</a>) that you want contribute to.</li>
+ <li>Create an issue that describes the work. Each Fluo repository has its own issue tracker: <a href="https://github.com/apache/fluo/issues">Fluo</a>, <a href="https://github.com/apache/fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/apache/incubator-fluo-website/issues">Fluo Website</a></li>
<li>
<p>Create a branch in the local clone of your fork. An example branch name is <code class="highlighter-rouge">fluo-301</code> which describes the repo and issue number.</p>
@@ -120,7 +120,7 @@ git push origin fluo-301
</code></pre>
</div>
</li>
- <li>Create a pull request on the GitHub page of the repo (e.g. <a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo-io/fluo-io.github.io">Fluo Website</a>) that you want to contribute to. The pull request should merge your branch (e.g. <code class="highlighter-rouge">fluo-301</code>) in your fork into the master branch of the repo.</li>
+ <li>Create a pull request on the GitHub page of the repo (e.g. <a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/apache/incubator-fluo-website">Fluo Website</a>) that you want to contribute to. The pull request should merge your branch (e.g. <code class="highlighter-rouge">fluo-301</code>) in your fork into the master branch of the repo.</li>
<li>At least one committer (and others in the community) will review your pull request and add any comments to your code.</li>
<li>Reviewers should make comments at bottom of the pull request or in \u201cFiles Changed\u201d. Avoid commenting on commits as these comments will disappear if the branch is rebased as rebasing generates new commits for the pull request.</li>
<li>Push any changes from the review to the branch as new commits so the reviewer only needs to review new changes.</li>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/release-process/index.html
----------------------------------------------------------------------
diff --git a/release-process/index.html b/release-process/index.html
index 52dd214..3d2604e 100644
--- a/release-process/index.html
+++ b/release-process/index.html
@@ -194,7 +194,7 @@ git push --delete origin 1.0.0-beta-1-RC1
</div>
</li>
<li>
- <p>View the <a href="https://github.com/fluo-io/fluo-io.github.io/blob/master/README.md">website README</a> for instructions on how to generate Javadocs and documentation using the released tag. Submit PR to the website repo to publish.</p>
+ <p>View the <a href="https://github.com/apache/incubator-fluo-website/blob/master/README.md">website README</a> for instructions on how to generate Javadocs and documentation using the released tag. Submit PR to the website repo to publish.</p>
</li>
<li>
<p>Send an email to <code class="highlighter-rouge">dev@fluo.incubator.apache.org</code> announcing new release.</p>
[3/7] incubator-fluo-website git commit: Merge branch
'add-disclaimer' into gh-pages
Posted by mw...@apache.org.
Merge branch 'add-disclaimer' into gh-pages
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/c01a0768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/c01a0768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/c01a0768
Branch: refs/heads/gh-pages
Commit: c01a07687cbaac76ae46095f4fa86e8c54ad136e
Parents: d6ab630 8345c5c
Author: Mike Walch <mw...@gmail.com>
Authored: Wed Jun 29 10:43:00 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:43:00 2016 -0400
----------------------------------------------------------------------
index.html | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[5/7] incubator-fluo-website git commit: Minor updates due to move to
Apache
Posted by mw...@apache.org.
Minor updates due to move to Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/83eba45d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/83eba45d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/83eba45d
Branch: refs/heads/gh-pages
Commit: 83eba45dbec449a84cd65de645767cf03f843d3f
Parents: 1b071da
Author: Mike Walch <mw...@gmail.com>
Authored: Mon Jun 27 11:33:23 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:44:45 2016 -0400
----------------------------------------------------------------------
README.md | 14 +++++++-------
_scripts/convert-docs.py | 2 +-
_scripts/convert-recipes.py | 2 +-
apidocs/index.md | 4 ++--
docs/index.md | 4 ++--
pages/download.md | 4 ++--
pages/getinvolved.md | 8 ++++----
pages/how-to-contribute.md | 12 ++++++------
pages/release-process.md | 2 +-
9 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e871fbd..ab87b21 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Fluo website
============
-Code powering the Fluo project website ([https://fluo.incubator.apache.org](https://fluo.incubator.apache.org)).
+Code powering the Fluo project website ([https://fluo.apache.org](https://fluo.apache.org)).
Contributions
-------------
@@ -27,9 +27,9 @@ Below are the steps required to update the Fluo project website for a new releas
your Fluo repo to this repo:
```bash
- cd fluo-io.github.io
+ cd fluo-website/
mkdir -p docs/1.0.0-beta-1
- ./_scripts/convert-docs.py /path/to/fluo/docs/ /path/to/fluo-io.github.io/docs/fluo/1.0.0-beta-1/
+ ./_scripts/convert-docs.py /path/to/fluo/docs/ /path/to/fluo-website/docs/fluo/1.0.0-beta-1/
```
2. Modify `docs/index.md` to point to new release and update the `latest_fluo_release`
@@ -40,7 +40,7 @@ Below are the steps required to update the Fluo project website for a new releas
repo named after your release version (i.e 1.0.0-beta-1):
```bash
- ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo/modules/api /path/to/fluo-io.github.io/apidocs/fluo
+ ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo/modules/api /path/to/fluo-website/apidocs/fluo
```
4. Modify `apidocs/index.md` to point to the new javadocs that you just generated.
@@ -55,9 +55,9 @@ Steps to update website for new Fluo Recipes release:
1. Run the commands below to copy and convert documentation in your release tag.
```bash
- cd fluo-io.github.io
+ cd fluo-website
mkdir -p docs/1.0.0-beta-1
- ./_scripts/convert-recipes.py /path/to/fluo-recipes/docs/ /path/to/fluo-io.github.io/docs/fluo-recipes/1.0.0-beta-1/
+ ./_scripts/convert-recipes.py /path/to/fluo-recipes/docs/ /path/to/fluo-website/docs/fluo-recipes/1.0.0-beta-1/
```
2. Modify `docs/index.md` to point to new release and update the `latest_recipes_release` variable in `_config.yml`.
@@ -67,7 +67,7 @@ Steps to update website for new Fluo Recipes release:
repo named after your release version (i.e 1.0.0-beta-1):
```bash
- ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo-recipes /path/to/fluo-io.github.io/apidocs/fluo-recipes
+ ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo-recipes /path/to/fluo-website/apidocs/fluo-recipes
```
4. Modify `apidocs/index.md` to point to the new javadocs that you just generated.
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/_scripts/convert-docs.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-docs.py b/_scripts/convert-docs.py
index e20e5c9..dc9a766 100755
--- a/_scripts/convert-docs.py
+++ b/_scripts/convert-docs.py
@@ -15,7 +15,7 @@ output_dir = sys.argv[2]
args = output_dir.rpartition("/docs")
url_prefix = args[1] + args[2]
release_ver = url_prefix.split("/")[3]
-github_prefix = "https://github.com/fluo-io/fluo/blob/{0}/modules/".format(release_ver)
+github_prefix = "https://github.com/apache/fluo/blob/{0}/modules/".format(release_ver)
apidocs_prefix = "/apidocs/fluo/{0}/".format(release_ver)
resources_prefix = "/docs/fluo/{0}/resources/".format(release_ver)
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/_scripts/convert-recipes.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-recipes.py b/_scripts/convert-recipes.py
index ad05e0a..bb901b9 100755
--- a/_scripts/convert-recipes.py
+++ b/_scripts/convert-recipes.py
@@ -15,7 +15,7 @@ output_dir = sys.argv[2]
args = output_dir.rpartition("/docs")
url_prefix = args[1] + args[2]
release_ver = url_prefix.split("/")[3]
-github_prefix = "https://github.com/fluo-io/fluo-recipes/blob/{0}/modules/".format(release_ver)
+github_prefix = "https://github.com/apache/fluo-recipes/blob/{0}/modules/".format(release_ver)
apidocs_prefix = "/apidocs/fluo-recipes/{0}/".format(release_ver)
def path_to_url(path):
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/apidocs/index.md
----------------------------------------------------------------------
diff --git a/apidocs/index.md b/apidocs/index.md
index 65b004b..c68f954 100644
--- a/apidocs/index.md
+++ b/apidocs/index.md
@@ -8,8 +8,8 @@ title: API Documentation
* Fluo API documentation - [Latest][fluo-api-latest] \| [Archive][fluo-api-archive]
* Fluo Recipes API docoumentation - [Latest][recipes-api-latest] \| [Archive][recipes-api-archive]
-[Fluo]: https://github.com/fluo-io/fluo
-[Fluo Recipes]: https://github.com/fluo-io/fluo-recipes
+[Fluo]: https://github.com/apache/fluo
+[Fluo Recipes]: https://github.com/apache/fluo-recipes
[fluo-api-latest]: /apidocs/fluo/{{ site.latest_fluo_release }}/
[recipes-api-latest]: /apidocs/fluo-recipes/{{ site.latest_recipes_release }}/
[fluo-api-archive]: /apidocs/fluo/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index 215d113..dcc27a9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -21,8 +21,8 @@ Latest release is `{{ site.latest_recipes_release }}` made on {{ site.latest_rec
* Fluo Recipes documentation - [Latest][recipes-docs-latest] \| [Archive][recipes-docs-archive]
* Fluo Recipes API - [Latest][recipes-api-latest] \| [Archive][recipes-api-archive]
-[Fluo]: https://github.com/apache/incubator-fluo
-[Fluo Recipes]: https://github.com/apache/incubator-fluo-recipes
+[Fluo]: https://github.com/apache/fluo
+[Fluo Recipes]: https://github.com/apache/fluo-recipes
[fluo-docs-latest]: /docs/fluo/{{ site.latest_fluo_release }}/
[fluo-api-latest]: /apidocs/fluo/{{ site.latest_fluo_release }}/
[fluo-sum-latest]: /release-summaries/{{ site.latest_fluo_release }}/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/download.md
----------------------------------------------------------------------
diff --git a/pages/download.md b/pages/download.md
index f07d856..8141c0c 100644
--- a/pages/download.md
+++ b/pages/download.md
@@ -14,8 +14,8 @@ or [Zetten] (which sets up Fluo on a cluster). Both will download and install F
If you would rather install and run Fluo on your own, follow these [installation instructions][install].
-[latest]: https://github.com/apache/incubator-fluo/releases/latest
-[all]: https://github.com/apache/incubator-fluo/releases
+[latest]: https://github.com/apache/fluo/releases/latest
+[all]: https://github.com/apache/fluo/releases
[fluo-dev]: https://github.com/fluo-io/fluo-dev
[Zetten]: https://github.com/fluo-io/zetten
[install]: /docs/fluo/{{ site.latest_fluo_release}}/prod-fluo-setup/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/getinvolved.md
----------------------------------------------------------------------
diff --git a/pages/getinvolved.md b/pages/getinvolved.md
index 165d004..2f8ed5c 100644
--- a/pages/getinvolved.md
+++ b/pages/getinvolved.md
@@ -25,11 +25,11 @@ Users can provide feedback by:
Contributions are welcome to all Fluo projects! All projects follow a [review-then-commit][rtc] process. If you are interested in contributing, read our [How To Contribute][htc] page.
-[f]: https://github.com/apache/incubator-fluo
-[r]: https://github.com/apache/incubator-fluo-recipes
+[f]: https://github.com/apache/fluo
+[r]: https://github.com/apache/fluo-recipes
[w]: https://github.com/fluo/fluo-io.github.io
-[fi]: https://github.com/apache/incubator-fluo/issues
-[ri]: https://github.com/apache/incubator-fluo-recipes/issues
+[fi]: https://github.com/apache/fluo/issues
+[ri]: https://github.com/apache/fluo-recipes/issues
[wi]: https://github.com/fluo/fluo-io.github.io/issues
[fnf]: irc://chat.freenode.net/fluo
[fn]: https://freenode.net/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/how-to-contribute.md
----------------------------------------------------------------------
diff --git a/pages/how-to-contribute.md b/pages/how-to-contribute.md
index b1bb991..2dd8480 100644
--- a/pages/how-to-contribute.md
+++ b/pages/how-to-contribute.md
@@ -67,12 +67,12 @@ This can be configured by common IDEs:
* Eclipse: ```Window -> Preferences -> Java -> Organize Imports```
* Intelli-J: ```Preferences -> Code Style -> Java -> Imports```
-[f]: https://github.com/apache/incubator-fluo
-[r]: https://github.com/apache/incubator-fluo-recipes
-[w]: https://github.com/fluo-io/fluo-io.github.io
-[fi]: https://github.com/apache/incubator-fluo/issues
-[ri]: https://github.com/apache/incubator-fluo-recipes/issues
-[wi]: https://github.com/fluo-io/fluo-io.github.io/issues
+[f]: https://github.com/apache/fluo
+[r]: https://github.com/apache/fluo-recipes
+[w]: https://github.com/apache/incubator-fluo-website
+[fi]: https://github.com/apache/fluo/issues
+[ri]: https://github.com/apache/fluo-recipes/issues
+[wi]: https://github.com/apache/incubator-fluo-website/issues
[tutorial]: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
[stackoverflow]: http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git
[rtc]: http://www.apache.org/foundation/glossary.html#ReviewThenCommit
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/release-process.md
----------------------------------------------------------------------
diff --git a/pages/release-process.md b/pages/release-process.md
index 597f50e..f45c7bc 100644
--- a/pages/release-process.md
+++ b/pages/release-process.md
@@ -103,7 +103,7 @@ When consensus has been reached on a release candidate, follow the steps below t
7. Send an email to `dev@fluo.incubator.apache.org` announcing new release.
-[website README]: https://github.com/fluo-io/fluo-io.github.io/blob/master/README.md
+[website README]: https://github.com/apache/incubator-fluo-website/blob/master/README.md
[documentation]: http://central.sonatype.org/pages/apache-maven.html
[sonatype account]: https://issues.sonatype.org/
[Release the artifacts]: http://central.sonatype.org/pages/releasing-the-deployment.html