Rebased onto trunk - fix conflicts
This commit is contained in:
parent
541b64c798
commit
307d55b3e1
|
@ -574,6 +574,11 @@ public class ServiceScheduler extends CompositeService {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override public void onContainerResourceUpdated(ContainerId containerId,
|
||||||
|
Resource resource) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Override public void onGetContainerStatusError(ContainerId containerId,
|
@Override public void onGetContainerStatusError(ContainerId containerId,
|
||||||
Throwable t) {
|
Throwable t) {
|
||||||
|
|
||||||
|
@ -585,6 +590,12 @@ public class ServiceScheduler extends CompositeService {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onUpdateContainerResourceError(ContainerId containerId,
|
||||||
|
Throwable t) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStopContainerError(ContainerId containerId, Throwable t) {
|
public void onStopContainerError(ContainerId containerId, Throwable t) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue