diff --git a/changelog.html b/changelog.html index e3db1ddaa1..7ac5297f50 100644 --- a/changelog.html +++ b/changelog.html @@ -88,9 +88,6 @@ Upcoming changes
  • Use $JENKINS_USER in Debian postinst script. (issue 5771) -
  • - Slaves taken offline due to insufficient disk space should automatically come back online when disk space is cleared. - (issue 2548) diff --git a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java index 1812b38845..ddf9a9ff22 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java @@ -45,10 +45,6 @@ public abstract class AbstractDiskSpaceMonitor extends NodeMonitor { if(getDescriptor().markOffline(c,size)) { LOGGER.warning(Messages.DiskSpaceMonitor_MarkedOffline(c.getName())); } - } else if (c.isTemporarilyOffline()) { - if (getDescriptor().markOnline(c)) { - LOGGER.warning(Messages.DiskSpaceMonitor_MarkedOnline(c.getName())); - } } return size; } diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java index 72c3ffe33c..3e7e2daa00 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java @@ -148,21 +148,6 @@ public abstract class AbstractNodeMonitorDescriptor extends Descriptor