Merge remote-tracking branch 'german/master' into merge
Conflicts: daemon/src/main/java/org/openslx/taskmanager/App.java
Branches merge
No related tags found
Showing
- api/src/main/java/org/openslx/taskmanager/api/AbstractTask.java 60 additions, 24 deletions...c/main/java/org/openslx/taskmanager/api/AbstractTask.java
- api/src/main/java/org/openslx/taskmanager/api/FinishCallback.java 11 additions, 0 deletions...main/java/org/openslx/taskmanager/api/FinishCallback.java
- api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java 85 additions, 23 deletions...n/java/org/openslx/taskmanager/api/SystemCommandTask.java
- api/src/main/java/org/openslx/taskmanager/api/TaskStatus.java 2 additions, 2 deletions...src/main/java/org/openslx/taskmanager/api/TaskStatus.java
- daemon/src/main/java/org/openslx/taskmanager/App.java 16 additions, 4 deletionsdaemon/src/main/java/org/openslx/taskmanager/App.java
- daemon/src/main/java/org/openslx/taskmanager/main/Taskmanager.java 33 additions, 38 deletions...c/main/java/org/openslx/taskmanager/main/Taskmanager.java
- daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandler.java 16 additions, 25 deletions.../java/org/openslx/taskmanager/network/NetworkHandler.java
- daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java 13 additions, 7 deletions...n/java/org/openslx/taskmanager/network/RequestParser.java
Loading
Please register or sign in to comment