flink git commit: Update incubator-flink name in the merge pull tools to flink.

[hs...@apache.org]

Repository: flink
Updated Branches:
  refs/heads/master 95fece85d -> bd7819a1e


Update incubator-flink name in the merge pull tools to flink.

Currently, the merge scripts in tools/ directory still have incubator-flink instead of flink.

This PR updates the name from incubator-flink to flink.

Author: Henry Saputra <he...@gmail.com>

Closes #313 from hsaputra/update_flink_repo_name_for_merge_tools and squashes the following commits:

1af279b [Henry Saputra] Update incubator-flink name in the merge pull tools.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bd7819a1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bd7819a1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bd7819a1

Branch: refs/heads/master
Commit: bd7819a1ece573c649095793718f26730c48e584
Parents: 95fece8
Author: Henry Saputra <he...@gmail.com>
Authored: Mon Jan 19 10:13:35 2015 -0800
Committer: Henry Saputra <he...@gmail.com>
Committed: Mon Jan 19 10:13:35 2015 -0800

----------------------------------------------------------------------
 tools/merge_flink_pr.py              | 4 ++--
 tools/merge_pull_request.sh.template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/bd7819a1/tools/merge_flink_pr.py
----------------------------------------------------------------------
diff --git a/tools/merge_flink_pr.py b/tools/merge_flink_pr.py
index 6b588a2..25aaec2 100755
--- a/tools/merge_flink_pr.py
+++ b/tools/merge_flink_pr.py
@@ -55,8 +55,8 @@ JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "pwendell")
 # ASF JIRA password
 JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "1234")
 
-GITHUB_BASE = "https://github.com/apache/incubator-flink/pull"
-GITHUB_API_BASE = "https://api.github.com/repos/apache/incubator-flink"
+GITHUB_BASE = "https://github.com/apache/flink/pull"
+GITHUB_API_BASE = "https://api.github.com/repos/apache/flink"
 JIRA_BASE = "https://issues.apache.org/jira/browse"
 JIRA_API_BASE = "https://issues.apache.org/jira"
 # Prefix added to temporary branches

http://git-wip-us.apache.org/repos/asf/flink/blob/bd7819a1/tools/merge_pull_request.sh.template
----------------------------------------------------------------------
diff --git a/tools/merge_pull_request.sh.template b/tools/merge_pull_request.sh.template
index 0333fec..41915dd 100755
--- a/tools/merge_pull_request.sh.template
+++ b/tools/merge_pull_request.sh.template
@@ -18,7 +18,7 @@
 #
 
 # the directory where you have your flink code
-export FLINK_HOME="/home/robert/projects/flink/incubator-flink"
+export FLINK_HOME="/home/robert/projects/flink"
 # Remote name which points to the Gihub site
 export PR_REMOTE_NAME="github_flink"
 # Remote name which points to Apache git
@@ -29,4 +29,4 @@ export JIRA_USERNAME"rmetzger"
 export JIRA_PASSWORD="Ideally, don't push your password to git."
 
 # Arch Linux users have to call "python2.7" here.
-python merge_flink_pr.py
\ No newline at end of file
+python merge_flink_pr.py