You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/02/09 17:11:12 UTC
[1/3] storm git commit: Print out the merge command for a given pull
request.
Repository: storm
Updated Branches:
refs/heads/master be64b2536 -> 2b39a39cb
Print out the merge command for a given pull request.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ab8a43de
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ab8a43de
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ab8a43de
Branch: refs/heads/master
Commit: ab8a43de2aab88118213624413defec7281ae968
Parents: 94b9608
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 14 11:07:17 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 14 11:07:17 2015 -0600
----------------------------------------------------------------------
dev-tools/github/__init__.py | 11 +++++++++++
dev-tools/storm-merge.py | 31 +++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ab8a43de/dev-tools/github/__init__.py
----------------------------------------------------------------------
diff --git a/dev-tools/github/__init__.py b/dev-tools/github/__init__.py
index c3e734e..2c533d0 100755
--- a/dev-tools/github/__init__.py
+++ b/dev-tools/github/__init__.py
@@ -107,3 +107,14 @@ class GitHub:
def openPulls(self, user, repo):
return self.pulls(user, repo, "open")
+
+ def pull(self, user, repo, number):
+ url = "https://api.github.com/repos/"+user+"/"+repo+"/pulls/"+number
+ req = urllib2.Request(url,None,self.headers)
+ result = urllib2.urlopen(req)
+ contents = result.read()
+ if result.getcode() != 200:
+ raise Exception(result.getcode() + " != 200 "+ contents)
+ got = json.loads(contents)
+ return GitPullRequest(got, self)
+
http://git-wip-us.apache.org/repos/asf/storm/blob/ab8a43de/dev-tools/storm-merge.py
----------------------------------------------------------------------
diff --git a/dev-tools/storm-merge.py b/dev-tools/storm-merge.py
new file mode 100755
index 0000000..06ae25f
--- /dev/null
+++ b/dev-tools/storm-merge.py
@@ -0,0 +1,31 @@
+#!/usr/bin/python
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from github import GitHub
+from optparse import OptionParser
+
+def main():
+ parser = OptionParser(usage="usage: %prog [options] [pull number]")
+ parser.add_option("-g", "--github-user", dest="gituser",
+ type="string", help="github user, if not supplied no auth is used", metavar="USER")
+
+ (options, args) = parser.parse_args()
+ github = GitHub(options)
+
+ for pullNumber in args:
+ pull = github.pull("apache", "storm", pullNumber)
+ print "git pull "+pull.fromRepo()+" "+pull.fromBranch()
+
+if __name__ == "__main__":
+ main()
+
[2/3] storm git commit: Merge branch 'STORM-626' of
https://github.com/revans2/incubator-storm
Posted by da...@apache.org.
Merge branch 'STORM-626' of https://github.com/revans2/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0b01d0a7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0b01d0a7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0b01d0a7
Branch: refs/heads/master
Commit: 0b01d0a7217b5eab23c85104021a0d53dc5e8482
Parents: be64b25 ab8a43d
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Feb 9 10:08:28 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Feb 9 10:08:28 2015 -0600
----------------------------------------------------------------------
dev-tools/github/__init__.py | 11 +++++++++++
dev-tools/storm-merge.py | 31 +++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
----------------------------------------------------------------------
[3/3] storm git commit: Update CHANGELOG for STORM-626
Posted by da...@apache.org.
Update CHANGELOG for STORM-626
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2b39a39c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2b39a39c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2b39a39c
Branch: refs/heads/master
Commit: 2b39a39cb37ca83cd21a3a856ae410c7f1f5a5b9
Parents: 0b01d0a
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Feb 9 10:09:21 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Feb 9 10:09:21 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2b39a39c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 491a1d0..59103f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@
* STORM-635: logviewer returns 404 if storm_home/logs is a symlinked dir.
* STORM-636: Faster, optional retrieval of last component error
* STORM-608: Storm UI CSRF escape characters not work correctly.
+ * STORM-626: Add script to print out the merge command for a given pull request.
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor