Changeset 15280 for branches/Async/HeuristicLab.Services.Hive
- Timestamp:
- 07/23/17 00:52:14 (7 years ago)
- Location:
- branches/Async
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/Async
- Property svn:mergeinfo changed
-
branches/Async/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Services.Hive (added) merged: 13397,13516
- Property svn:mergeinfo changed
-
branches/Async/HeuristicLab.Services.Hive/3.3/HiveService.cs
r13142 r15280 966 966 || task.Command == DA.Command.Stop && task.State == DA.TaskState.Aborted) { 967 967 task.Command = null; 968 } else if (taskStateEntity == DA.TaskState.Paused && task.Command != null) {968 } else if (taskStateEntity == DA.TaskState.Paused && task.Command == null) { 969 969 // slave paused and uploaded the task (no user-command) -> set waiting. 970 970 taskStateEntity = DA.TaskState.Waiting;
Note: See TracChangeset
for help on using the changeset viewer.