Repository: incubator-zeppelin Updated Branches: refs/heads/master e8444cb69 -> e6a845fc2
Update commit merge script Small update - jira package name has changed Author: Felix Cheung <[email protected]> Closes #674 from felixcheung/mergescript and squashes the following commits: 384868b [Felix Cheung] update merge script Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/e6a845fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/e6a845fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/e6a845fc Branch: refs/heads/master Commit: e6a845fc28b75d5282e9b7d0bab8eb97248f3c42 Parents: e8444cb Author: Felix Cheung <[email protected]> Authored: Mon Jan 25 20:46:14 2016 -0800 Committer: Felix Cheung <[email protected]> Committed: Sat Jan 30 15:51:08 2016 -0800 ---------------------------------------------------------------------- dev/merge_zeppelin_pr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/e6a845fc/dev/merge_zeppelin_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_zeppelin_pr.py b/dev/merge_zeppelin_pr.py index a961234..61bbd6f 100755 --- a/dev/merge_zeppelin_pr.py +++ b/dev/merge_zeppelin_pr.py @@ -39,7 +39,7 @@ except ImportError: # Location of your Zeppelin git development area ZEPPELIN_HOME = os.environ.get("ZEPPELIN_HOME", os.getcwd()) -# Remote name which points to the Gihub site +# Remote name which points to the Github site PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github") # Remote name which points to Apache git PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache") @@ -352,5 +352,5 @@ if JIRA_IMPORTED: print "JIRA_USERNAME and JIRA_PASSWORD not set" print "Exiting without trying to close the associated JIRA." else: - print "Could not find jira-python library. Run 'sudo pip install jira-python' to install." + print "Could not find jira library. Run 'sudo pip install jira' to install." print "Exiting without trying to close the associated JIRA."
