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:11 UTC
[2/3] git commit: Merge branch 'master' of
git://git.apache.org/incubator-datafu
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.