You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2016/01/06 07:49:12 UTC
[1/3] incubator-apex-site git commit: Fix contributing guidelines
link.
Repository: incubator-apex-site
Updated Branches:
refs/heads/master e2ba9be10 -> 828495383
Fix contributing guidelines link.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/5215c2c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/5215c2c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/5215c2c5
Branch: refs/heads/master
Commit: 5215c2c5c31154c67491876fd7e428169ce7c828
Parents: 7424ddb
Author: Thomas Weise <th...@datatorrent.com>
Authored: Sat Jan 2 13:00:51 2016 -0800
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Sat Jan 2 13:00:51 2016 -0800
----------------------------------------------------------------------
src/md/docs.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/5215c2c5/src/md/docs.md
----------------------------------------------------------------------
diff --git a/src/md/docs.md b/src/md/docs.md
index f3eb432..fcdf9c6 100644
--- a/src/md/docs.md
+++ b/src/md/docs.md
@@ -12,7 +12,7 @@
- [Application Developer Guide](http://docs.datatorrent.com/application_development/)
- [Application Packages Guide](http://docs.datatorrent.com/application_packages/)
- [Operator Developer Guide](http://docs.datatorrent.com/operator_development/)
-- [Merging Github Mirror Pull Requests](/github-mirror-pull-requests.html)
+- [Contributing Guidelines](/contributing.html)
- [JavaDoc](https://www.datatorrent.com/docs/apidocs/)
- [Benchmarks compare between 2.0 and 3.0](https://www.datatorrent.com/blog-apex-performance-benchmark/)
[3/3] incubator-apex-site git commit: Update to merge instructions.
Posted by th...@apache.org.
Update to merge instructions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/82849538
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/82849538
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/82849538
Branch: refs/heads/master
Commit: 828495383ebb8822a80dcafaad61e18d50b4a234
Parents: 0344d70
Author: Thomas Weise <th...@datatorrent.com>
Authored: Tue Jan 5 22:48:24 2016 -0800
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Tue Jan 5 22:48:24 2016 -0800
----------------------------------------------------------------------
src/md/contributing.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/82849538/src/md/contributing.md
----------------------------------------------------------------------
diff --git a/src/md/contributing.md b/src/md/contributing.md
index 5f454dc..1be6909 100644
--- a/src/md/contributing.md
+++ b/src/md/contributing.md
@@ -117,6 +117,6 @@ Thanks for contributing!
1. Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the `dev@apex.incubator.apache.org` mailing list to see the exact commands to merge the given pull request.
1. Once done with verification, push the changes to the ASF repository's `devel-3` branch. Within a few
seconds, the changes will propagate back to the github mirror and the pull requests be closed and marked merged automatically.
-1. The `Fix version` field on the corresponding JIRA ticket needs to be set after pushing the changes.
+1. The `Fix version` field on the corresponding JIRA ticket needs to be set and the ticket resolved after pushing the changes.
**Note: since none of us has write access to the mirror, only the author of a pull request can close it if it was not merged.**
[2/3] incubator-apex-site git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-apex-site
Posted by th...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-apex-site
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/0344d703
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/0344d703
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/0344d703
Branch: refs/heads/master
Commit: 0344d7037ac2bea369c804a1986ed61ec3990a42
Parents: 5215c2c e2ba9be
Author: Thomas Weise <th...@datatorrent.com>
Authored: Tue Jan 5 22:44:13 2016 -0800
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Tue Jan 5 22:44:13 2016 -0800
----------------------------------------------------------------------
README.md | 16 +++
gulpfile.js | 20 ++-
roadmap.json | 292 +++++++++++++++++++++++++---------------
src/md/community.md | 2 +-
src/md/contributing.md | 2 +-
src/md/upcoming-meetups.md | 3 +-
src/pages/roadmap.html | 12 +-
7 files changed, 220 insertions(+), 127 deletions(-)
----------------------------------------------------------------------