Skip to content

Commit c0eae77

Browse files
committed
fix wrong cherry-pick merge
1 parent ce3b2f0 commit c0eae77

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

scheduler/smartproxy-common/src/main/java/org/ow2/proactive/scheduler/smartproxy/common/AbstractSmartProxy.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,9 @@ public String getTaskServerLogs(String id, String taskName) throws UnknownJobExc
135135
}
136136

137137

138-
@Override
139-
public String getTaskServerLogsByTag(String id, String taskTag) throws UnknownJobException, NotConnectedException, PermissionException {
140-
return getScheduler().getTaskServerLogsByTag(id, taskTag);
141-
}
142138

143139
@Override
144-
public Page<JobInfo> getJobs(int offset, int limit, JobFilterCriteria filterCriteria, List<SortParameter<JobSortParameter>> sortParameters) throws NotConnectedException, PermissionException {
140+
public List<JobInfo> getJobs(int offset, int limit, JobFilterCriteria filterCriteria, List<SortParameter<JobSortParameter>> sortParameters) throws NotConnectedException, PermissionException {
145141
return getScheduler().getJobs(offset, limit, filterCriteria, sortParameters);
146142
}
147143

0 commit comments

Comments
 (0)