Console Output

[appng-scheduler] Running shell script
+ git merge --ff appng-scheduler-1.11.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 CONTRIBUTING.adoc                                  |  4 ++
 application-home/beans.xml                         |  5 +--
 changelog.txt                                      | 34 ++++++++++++++
 license-header.txt                                 |  2 +-
 pom.xml                                            |  2 +-
 .../scheduler/quartz/SchedulerFactoryBean.java     | 52 ++++++++++++++++++++++
 6 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 changelog.txt
 create mode 100644 src/main/java/org/appng/application/scheduler/quartz/SchedulerFactoryBean.java