lenboo
8c2d211450
remove duplicate code
4 years ago
xingchun-chen
8736f101b6
Merge pull request #3029 from xsbai/dev
...
Fix Issue #3017
4 years ago
lenboo
ea1c653e08
merge from dev
4 years ago
lenboo
8e7bdfa276
update ut
4 years ago
xsbai
f7533e0bd0
modifiy the error comment
4 years ago
xsbai
0654757f15
modifiy the error comment
4 years ago
xsbai
597e34bd87
Merge branch 'dev' of github.com:xsbai/incubator-dolphinscheduler into dev
4 years ago
CalvinKirs
518d03b6a6
Simplify some methods for easy understanding ( #2920 )
...
Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com>
4 years ago
BoYiZhang
45785dbaef
Set default time zone ( #3006 )
...
Date type date problem in spring serializing Java
Solution: Spring serializes Java's date type date problem
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
xsbai
6e0b464531
fix issue #3018 [BUG]i18n incomplete ( #3022 )
...
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
dailidong
4aed82c315
Merge branch 'dev' into dev
4 years ago
CalvinKirs
4aa1826718
fix testSqoopTaskTest bug ( #3024 )
4 years ago
lenboo
b81872cacd
merge from dev-1.3.0
4 years ago
xsbai
c56e555ae0
Merge branch 'dev' into dev
4 years ago
xsbai
f874e8dcce
fix issue #3018 [BUG]i18n incomplete
4 years ago
lenboo
73cae7f046
merge from dev-1.3.0
4 years ago
gabry.wu
a65cb48191
always send emails no matter there are results ( #3015 )
...
* always send emails no matter there are results
* always send emails no matter there are results
4 years ago
dailidong
620ecffa72
fix singe resource manager will NPE ( #3013 )
...
* fix worker group config no effect
* remove codehaus janino jar
the license about janino maybe not compatiable with Apache v2
* Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0
# Conflicts:
# dolphinscheduler-server/src/main/resources/config/install_config.conf
* datasource config
* Update datasource.properties
* fix RunConfig bug
* remove param monitor server state
* fix table T_DS_ALERT
* update h2 database
* fix #2910 master server will show exception for some time when it restart
* fix oom when no master is active
* fix worker oom when master server restart
* fix oom
* fix
* add UT
* fix worker group config no effect
* fix singe resource manager will NPE
* Update HadoopUtilsTest.java
4 years ago
lenboo
714ae33e40
merge from dev
4 years ago
break60
08beae8358
Fix unfiltered jar files in resource directory and UDF upload resource parameters ( #3008 )
...
* Change email to default
* Fix unfiltered jar files in resource directory and UDF upload resource parameters
4 years ago
Erik-ly
eef397675b
Fix bug #2991 duplicate key: DOLPHIN_ALERT ( #2993 )
...
edit duplicate DOLPHIN_ALERT and label
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
lgcareer
25607f8815
fix download resource file that under the directory error ( #3007 )
...
* add mybatis-3 notice in the top-level notice
* fix download resource file that under the directory error
4 years ago
Yichao Yang
0744d4070c
[Hotfix-2922][common] Fix Jackson UDde error ( #2922 ) ( #2926 )
...
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
lgcareer
1c47a15ddb
add mybatis-3 notice in the top-level notice ( #3003 )
4 years ago
superScala
8031c1624a
add break & default logic for NettyDecoder.decode ( #2969 )
...
* add break & default logic for NettyDecoder.decode
* fix the bad code smells
Co-authored-by: gabry <wu_shao_jie@qq.com>
Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
Yichao Yang
f7ea4f1978
[Feature-2127][sql-schema] Fix the mysql version limited error for 5.5x - 5.64 ( #2911 )
...
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
break60
f26367fa47
Change email to default ( #2981 )
4 years ago
Rubik-W
24c7f764f6
Merge pull request #2734 from gabrywu/removeUnnecessaryLock
...
remove unnecessary lock & fix syncWorkerHostWeight variable reference
4 years ago
gabry.wu
f532853f60
Merge branch 'dev' into removeUnnecessaryLock
4 years ago
743294668
a58d1b3b45
Modify OracleDB connection string format. ( #2970 )
...
Co-authored-by: taoyuxin <taoyuxin@inspur.com>
4 years ago
xingchun-chen
40269a5db3
Merge pull request #2972 from break60/dev-1.3.0
...
Delete the pom files animation.scss, _normalize.scss and _animation.s…
4 years ago
break60
b939ab8e1d
Delete the pom files animation.scss, _normalize.scss and _animation.scss under the common folder
4 years ago
superScala
3a7fd725c7
first show: remove unnecessary code ( #2968 )
...
Co-authored-by: gabry <wu_shao_jie@qq.com>
4 years ago
Yichao Yang
0e7403e6a8
[Feature-2927][common] Fix NEF when get info from OSUtils ( #2927 ) ( #2964 )
...
* [Feature-2927][common] Fix NEF when get info from OSUtils (#2927 )
* Update OSUtils.java
Change java doc
Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com>
4 years ago
Kevin
9fd728908f
remove unused import #2715 ( #2718 )
...
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com>
4 years ago
gabry.wu
f1f9b59b3e
Merge branch 'dev' into removeUnnecessaryLock
4 years ago
gabry.wu
11c4c58328
Merge pull request #2960 from simon824/dev
...
Using Jackson instead of Fastjson
4 years ago
Rubik-W
c0ddadef4d
Merge branch 'dev' into removeUnnecessaryLock
4 years ago
simon824
3eb367096a
Resolved the conflict
4 years ago
simon824
3fa4dd702b
Resolved the conflict
4 years ago
Simon
2e4adbe03f
Update pom.xml
4 years ago
Simon
eebd0c73bb
Merge pull request #3 from apache/dev
...
merge
4 years ago
Simon
6c5b0706f5
Update pom.xml
4 years ago
Simon
7f725c32b5
Update pom.xml
4 years ago
BoYiZhang
f56ae9e64a
add http task timeout & test unit ( #2955 )
...
* add http task timeout & test unit
* add http task timeout & test unit
Co-authored-by: zhanglong <zhanglong@ysstech.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
lijufeng2016
284c50f66c
Compatible with flink1.10 or newer ( #2952 )
...
* 兼容flink1.10以上版本
* fix null point bug
Co-authored-by: 李巨丰 <lijf@2345.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
4 years ago
simon824
1b7d8ee236
fix the bad code smell
4 years ago
simon824
65953fe257
fix testBuildDataxJobContentJson
4 years ago
simon824
24120a4641
fix the bad code smell
4 years ago
simon824
cfecfb799b
1. change windows new line 'CR' to linux new line 'LF'
...
2. solve conflict
4 years ago