Backed out changeset 7bdad07e8dd8 (bug 1356225)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 14 Apr 2017 17:18:26 +0200
changeset 353104 c1eb12d2ea42262d14f6ddd29158ec903c77594d
parent 353103 7930966bcdfda3c7dbb04d4446f7a571aa9cfff2
child 353105 bca7ff5030f8dfa3755d9876ba290bf87b985cb5
push id31657
push userarchaeopteryx@coole-files.de
push dateFri, 14 Apr 2017 15:20:18 +0000
treeherdermozilla-central@1a1069b27f40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1356225
milestone55.0a1
backs out7bdad07e8dd897211b576bf111a7b9090290ecd9
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 7bdad07e8dd8 (bug 1356225) MozReview-Commit-ID: 9z7Z8w9Nz73
testing/web-platform/update/github.py
--- a/testing/web-platform/update/github.py
+++ b/testing/web-platform/update/github.py
@@ -44,17 +44,16 @@ class GitHub(object):
         if data is not None:
             kwargs["data"] = json.dumps(data)
 
         resp = requests.request(method, url, **kwargs)
 
         if 200 <= resp.status_code < 300:
             return resp.json()
         else:
-            print method, path, resp.status_code, resp.json()
             raise GitHubError(resp.status_code, resp.json())
 
     def repo(self, owner, name):
         """GitHubRepo for a particular repository.
 
         :param owner: String repository owner
         :param name: String repository name
         """
@@ -135,17 +134,17 @@ class PullRequest(object):
         if self._issue is None:
             self._issue = Issue.from_number(self.repo, self.number)
         return self._issue
 
     def merge(self):
         """Merge the Pull Request into its base branch.
         """
         self.repo.gh.put(self.path("merge"),
-                         {"merge_method": "merge"},
+                         {"merge_method": "rebase"},
                          headers={"Accept": "application/vnd.github.polaris-preview+json"})
 
 
 class Issue(object):
     def __init__(self, repo, data):
         """Object representing a GitHub Issue"""
         self.repo = repo
         self._data = data