Repository: parquet-cpp Updated Branches: refs/heads/master 337cf584e -> f91189abc
PARQUET-419: Cleanup dev/ scripts. Author: Nong Li <[email protected]> Closes #17 from nongli/parquet-419 and squashes the following commits: f071354 [Nong Li] PARQUET-419: Cleanup dev/ scripts. Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/f91189ab Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/f91189ab Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/f91189ab Branch: refs/heads/master Commit: f91189abc39fcc32cc880bc9011e03386cec2433 Parents: 337cf58 Author: Nong Li <[email protected]> Authored: Wed Jan 13 11:35:22 2016 -0800 Committer: Julien Le Dem <[email protected]> Committed: Wed Jan 13 11:35:22 2016 -0800 ---------------------------------------------------------------------- dev/README.md | 14 +++++++------- dev/merge_parquet_pr.py | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/f91189ab/dev/README.md ---------------------------------------------------------------------- diff --git a/dev/README.md b/dev/README.md index fa4a215..6dbe1fd 100644 --- a/dev/README.md +++ b/dev/README.md @@ -7,8 +7,8 @@ Merging a pull request requires being a committer on the project. * How to merge a Pull request: have an apache and apache-github remote setup ``` -git remote add apache-github [email protected]:apache/incubator-parquet-cpp.git -git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-parquet-cpp.git +git remote add apache-github [email protected]:apache/parquet-cpp.git +git remote add apache https://git-wip-us.apache.org/repos/asf/parquet-cpp.git ``` run the following command ``` @@ -16,26 +16,26 @@ dev/merge_parquet_pr.py ``` Note: -* The parent directory of your parquet repository must be called parquet-mr +* The parent directory of your parquet repository must be called parquet-cpp * Without jira-python installed you'll have to close the JIRA manually example output: ``` Which pull request would you like to merge? (e.g. 34): ``` -Type the pull request number (from https://github.com/apache/incubator-parquet-mr/pulls) and hit enter. +Type the pull request number (from https://github.com/apache/parquet-cpp/pulls) and hit enter. ``` === Pull Request #X === title Blah Blah Blah source repo/branch target master -url https://api.github.com/repos/apache/incubator-parquet-mr/pulls/X +url https://api.github.com/repos/apache/parquet-cpp/pulls/X Proceed with merging pull request #3? (y/n): ``` If this looks good, type y and hit enter. ``` -From git-wip-us.apache.org:/repos/asf/incubator-parquet-mr.git +From git-wip-us.apache.org:/repos/asf/parquet-cpp.git * [new branch] master -> PR_TOOL_MERGE_PR_3_MASTER Switched to branch 'PR_TOOL_MERGE_PR_3_MASTER' @@ -49,7 +49,7 @@ Delta compression using up to 4 threads. Compressing objects: 100% (26/26), done. Writing objects: 100% (36/36), 5.32 KiB, done. Total 36 (delta 17), reused 0 (delta 0) -To git-wip-us.apache.org:/repos/asf/incubator-parquet-mr.git +To git-wip-us.apache.org:/repos/asf/parquet-cpp.git b767ac4..485658a PR_TOOL_MERGE_PR_X_MASTER -> master Restoring head pointer to b767ac4e Note: checking out 'b767ac4e'. http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/f91189ab/dev/merge_parquet_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py index 524fe9f..dcb7af6 100755 --- a/dev/merge_parquet_pr.py +++ b/dev/merge_parquet_pr.py @@ -42,8 +42,6 @@ except ImportError: # Location of your Parquet git development area PARQUET_HOME = os.path.abspath(__file__).rsplit("/", 2)[0] PROJECT_NAME = PARQUET_HOME.rsplit("/", 1)[1] -if PROJECT_NAME.find("incubator-") != 0: - PROJECT_NAME = "incubator-" + PROJECT_NAME print "PARQUET_HOME = " + PARQUET_HOME print "PROJECT_NAME = " + PROJECT_NAME
