Commit Graph

15 Commits

Author SHA1 Message Date
lenboo 5d9063c530 Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev-up
# Conflicts:
#	escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
#	escheduler-alert/src/main/resources/alert.properties
#	escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java
#	escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java
#	escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
2019-05-30 14:19:32 +08:00
ligang 9d943bdc89 [maven-release-plugin] prepare for next development iteration 2019-05-27 10:57:57 +08:00
ligang 4b929f9501 [maven-release-plugin] prepare release 1.0.3 2019-05-27 10:57:41 +08:00
chgxtony 958556e61b upgrade spring-boot to 2.1.x and spring to 5.x 2019-04-29 14:09:09 +08:00
ligang 2c4c4cc0c0 [maven-release-plugin] prepare for next development iteration 2019-04-26 20:10:33 +08:00
ligang 5f396232d6 [maven-release-plugin] prepare release 1.0.2 2019-04-26 20:07:39 +08:00
ligang a5ba3eccb9 [maven-release-plugin] prepare for next development iteration 2019-04-26 18:53:28 +08:00
ligang b5efd57150 [maven-release-plugin] prepare release 1.0.2 2019-04-26 18:50:35 +08:00
ligang 9ab17510a4 [maven-release-plugin] prepare for next development iteration 2019-04-12 18:43:29 +08:00
ligang 595aece4c1 [maven-release-plugin] prepare release 1.0.1 2019-04-12 18:43:09 +08:00
ligang 4645614a49 [maven-release-plugin] prepare for next development iteration 2019-03-30 11:12:58 +08:00
ligang 76371ee46b [maven-release-plugin] prepare release 1.0.0 2019-03-30 11:12:38 +08:00
ligang f9379e41d8 [maven-release-plugin] prepare branch branch-1.0.0 2019-03-30 11:07:24 +08:00
ligang e36c4b95c3 update version value 2019-03-29 16:47:10 +08:00
ligang a2dccd16f7 Initial escheduler-alert commit 2019-03-29 13:08:18 +08:00