You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafu.apache.org by mh...@apache.org on 2014/04/28 02:26:10 UTC
[1/3] git commit: Fix website README command
Repository: incubator-datafu
Updated Branches:
refs/heads/master e160f8053 -> e26e0a9f2
Fix website README command
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/9c6475a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/9c6475a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/9c6475a9
Branch: refs/heads/master
Commit: 9c6475a994901d6bc6340b3c880e25b3b7c55c58
Parents: 7872608
Author: Matt Hayes <mh...@linkedin.com>
Authored: Wed Mar 5 20:49:04 2014 -0800
Committer: Matt Hayes <mh...@linkedin.com>
Committed: Wed Mar 5 20:49:04 2014 -0800
----------------------------------------------------------------------
site/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/9c6475a9/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index 49417f2..ba34fa3 100644
--- a/site/README.md
+++ b/site/README.md
@@ -26,6 +26,6 @@ Now visit [http://localhost:4567/](http://localhost:4567/) to see the website in
The static content can be built with:
- bundle exec build
+ bundle exec middleman build
This will produces the content in the `/build` directory.
[3/3] git commit: Website: Add link to ApacheCon slides and a
corresponding blog post
Posted by mh...@apache.org.
Website: Add link to ApacheCon slides and a corresponding blog post
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/e26e0a9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/e26e0a9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/e26e0a9f
Branch: refs/heads/master
Commit: e26e0a9f26588c8bdc1e8e6ac74cd47a0c1089d6
Parents: ac57a45
Author: Matt Hayes <mh...@linkedin.com>
Authored: Sun Apr 27 17:25:20 2014 -0700
Committer: Matt Hayes <mh...@linkedin.com>
Committed: Sun Apr 27 17:25:20 2014 -0700
----------------------------------------------------------------------
site/source/blog/2014-04-27-datafu-at-apachecon.markdown | 6 ++++++
site/source/docs/datafu/guide.html.markdown.erb | 3 ++-
site/source/docs/hourglass/contributing.html.markdown | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/e26e0a9f/site/source/blog/2014-04-27-datafu-at-apachecon.markdown
----------------------------------------------------------------------
diff --git a/site/source/blog/2014-04-27-datafu-at-apachecon.markdown b/site/source/blog/2014-04-27-datafu-at-apachecon.markdown
new file mode 100644
index 0000000..e5dbada
--- /dev/null
+++ b/site/source/blog/2014-04-27-datafu-at-apachecon.markdown
@@ -0,0 +1,6 @@
+---
+title: DataFu @ Apache 2014
+author: Matthew Hayes
+---
+
+[William Vaughan](https://www.linkedin.com/in/williamgvaughan) gave a presentation at ApacheCon North America on Apache DataFu. Check out the [slides](http://www.slideshare.net/williamgvaughan/datafu-apachecon-33420740) for a great overview of Apache DataFu and some of the cool things you can do with it.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/e26e0a9f/site/source/docs/datafu/guide.html.markdown.erb
----------------------------------------------------------------------
diff --git a/site/source/docs/datafu/guide.html.markdown.erb b/site/source/docs/datafu/guide.html.markdown.erb
index ff642f1..5ff6659 100644
--- a/site/source/docs/datafu/guide.html.markdown.erb
+++ b/site/source/docs/datafu/guide.html.markdown.erb
@@ -37,4 +37,5 @@ Our policy is to test against the most recent version of Pig whenever we release
## Presentations
* [A Brief Tour of DataFu](http://www.slideshare.net/matthewterencehayes/datafu)
-* [Building Data Products at LinkedIn with DataFu](http://www.slideshare.net/matthewterencehayes/building-data-products-at-linkedin-with-datafu)
\ No newline at end of file
+* [Building Data Products at LinkedIn with DataFu](http://www.slideshare.net/matthewterencehayes/building-data-products-at-linkedin-with-datafu)
+* [DataFu @ ApacheCon 2014](http://www.slideshare.net/williamgvaughan/datafu-apachecon-33420740)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/e26e0a9f/site/source/docs/hourglass/contributing.html.markdown
----------------------------------------------------------------------
diff --git a/site/source/docs/hourglass/contributing.html.markdown b/site/source/docs/hourglass/contributing.html.markdown
index 7ee7c95..279fc14 100644
--- a/site/source/docs/hourglass/contributing.html.markdown
+++ b/site/source/docs/hourglass/contributing.html.markdown
@@ -11,7 +11,7 @@ https://cwiki.apache.org/confluence/display/DATAFU/Contributing+to+Apache+DataFu
## Common Tasks
-Common tasks for working with the DataFu Pig code can be found below. For information on how to contribute patches, please
+Common tasks for working with the DataFu Hourglass code can be found below. For information on how to contribute patches, please
follow the wiki link above.
### Build the JAR
[2/3] git commit: Merge branch 'master' of
git://git.apache.org/incubator-datafu
Posted by mh...@apache.org.
Merge branch 'master' of git://git.apache.org/incubator-datafu
Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/ac57a458
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/ac57a458
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/ac57a458
Branch: refs/heads/master
Commit: ac57a45820336724c6e4b055590223cfe277998b
Parents: 9c6475a e160f80
Author: Matt Hayes <mh...@linkedin.com>
Authored: Sat Apr 26 07:52:25 2014 -0700
Committer: Matt Hayes <mh...@linkedin.com>
Committed: Sat Apr 26 07:52:25 2014 -0700
----------------------------------------------------------------------
.../jobs/AbstractNonIncrementalJob.java | 2 +-
...stractPartitionPreservingIncrementalJob.java | 2 +-
.../datafu/hourglass/jobs/DateRangePlanner.java | 8 +++---
.../datafu/hourglass/jobs/ExecutionPlanner.java | 2 +-
.../PartitionPreservingExecutionPlanner.java | 2 +-
.../datafu/hourglass/jobs/StagedOutputJob.java | 2 +-
.../src/main/java/datafu/pig/bags/BagGroup.java | 6 ++---
.../java/datafu/test/pig/bags/BagTests.java | 10 +++++---
site/README.md | 26 ++++++++++++++++++++
.../docs/datafu/contributing.html.markdown | 17 +++++++++----
.../docs/hourglass/contributing.html.markdown | 13 +++++++---
11 files changed, 67 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/ac57a458/site/README.md
----------------------------------------------------------------------
diff --cc site/README.md
index ba34fa3,eb0a3fe..dd2777d
--- a/site/README.md
+++ b/site/README.md
@@@ -26,6 -26,32 +26,32 @@@ Now visit [http://localhost:4567/](http
The static content can be built with:
- bundle exec build
+ bundle exec middleman build
This will produces the content in the `/build` directory.
+
+ ## Check out the website source
+
+ The static website content is located in another repo:
+
+ svn co https://svn.apache.org/repos/asf/incubator/datafu apache-datafu-website
+
+ ## Commit the changes
+
+ In the `apache-datafu-website` folder, delete the old content, which we will be replacing
+ with new content:
+
+ cd apache-datafu-website
+ rm -rf site
+
+ Now copy the built content to the `apache-datafu-website` folder, replacing the old `site` folder:
+
+ cp -r ~/Projects/incubator-datafu/site/build site
+
+ Check what has changed:
+
+ svn status
+
+ If you have added or removed files, you may need to run `svn add` or `svn rm`.
+
-Once you are satisfied with the changes you can commit.
++Once you are satisfied with the changes you can commit.