Console Output

+ git merge --ff appng-scheduler-1.16.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 changelog.txt                                      | 12 ++++++++
 pom.xml                                            |  6 ++--
 .../application/scheduler/model/JobRecord.java     | 17 +++++++++++
 .../scheduler/service/JobRecordService.java        | 33 ++++++++++++----------
 .../scheduler/service/JobStateRestController.java  | 12 ++++----
 5 files changed, 55 insertions(+), 25 deletions(-)