summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-07 00:45:50 +0000
committerGerrit Code Review <review@openstack.org>2017-03-07 00:45:50 +0000
commit14c6c5a3ec49b1502d6e640423bf051280d6fbfa (patch)
tree4daab3b5fc5c7989f860527c56f2843646e3bfda
parent500d27b35008c8bba47a0127963fddf279d0b6ff (diff)
parent936b1778f625515e1a3137e6ca8854e4f12950bc (diff)
downloadzuul-14c6c5a3ec49b1502d6e640423bf051280d6fbfa.tar.gz
Merge "Remove unused mergeChangeQueue method" into feature/zuulv3
-rw-r--r--zuul/model.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/zuul/model.py b/zuul/model.py
index 76038a416..9118fd405 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -305,12 +305,6 @@ class ChangeQueue(object):
item.item_ahead.items_behind.append(item)
return True
- def mergeChangeQueue(self, other):
- for project in other.projects:
- self.addProject(project)
- self.window = min(self.window, other.window)
- # TODO merge semantics
-
def isActionable(self, item):
if self.window:
return item in self.queue[:self.window]