[JENKINS-28926] Noting merge of #1743

jenkinsci · Jun 17, 2015 · a208dfe · a208dfe
1 parent 7929412
commit a208dfe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog.html b/changelog.html
@@ -80,6 +80,9 @@
   <li class=bug>
     Fix deadlock between hudson.model.Queue and hudson.model.Computer.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-288040">issue 28840</a>)
+  <li class=bug>
+    Fix jobs getting stuck in the Queue when there exists a cycle of upstream/downstream blocks between them.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-28926">issue 28926</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 <h3><a name=v1.617>What's new in 1.617</a> (2015/06/07)</h3>

diff --git a/core/src/main/java/hudson/model/queue/QueueSorter.java b/core/src/main/java/hudson/model/queue/QueueSorter.java
@@ -26,7 +26,7 @@ public abstract class QueueSorter implements ExtensionPoint {
      * (We want the time since in queue by default as blocking on upstream/downstream considers waiting items
      * also and thus the blocking starts once the task is in the queue not once the task is buildable)
      *
-     * @since 1.FIXME
+     * @since 1.618
      */
     public static final Comparator<Queue.BlockedItem> DEFAULT_BLOCKED_ITEM_COMPARATOR = new Comparator<Queue.BlockedItem>() {
         @Override
@@ -50,7 +50,7 @@ public int compare(Queue.BlockedItem o1, Queue.BlockedItem o2) {
      *
      * @param blockedItems
      *      List of blocked items in the queue. Never null.
-     * @since 1.FIXME
+     * @since 1.618
      */
     public void sortBlockedItems(List<Queue.BlockedItem> blockedItems) {
         Collections.sort(blockedItems, DEFAULT_BLOCKED_ITEM_COMPARATOR);