Commit Graph

2543 Commits

Author SHA1 Message Date
lgcareer
bc5a4dfd2a
[bug fix][ambari-plugin]cherry pr3096 that write unit into config file (#3367)
* resolve #3096 fixbug ambari plugin the config options which has unit doesnt write unit into config file (#3209)

Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>

* remove 1.2.1 directory and cherry pick pr 3096

* change 1.3.0 to 1.3.2 of the ambari plugin

Co-authored-by: zhangchunyang <zhangchunyang0123@gmail.com>
Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>
2020-08-01 11:00:06 +08:00
break60
6f7727409c Merge branch '1.3.2-release' of https://github.com/apache/incubator-dolphinscheduler into 1.3.2-release 2020-07-30 15:04:34 +08:00
break60
909294d4f5
[bugFix-#3357][ui] Select the dag connection to pop up the label edit box (#3358)
* [bugFix][ui] Cannot select connection

* fix
2020-07-30 15:03:44 +08:00
break60
80c5c66ce9 fix 2020-07-30 14:03:23 +08:00
break60
e5d2f807c9 [bugFix][ui] Cannot select connection 2020-07-30 11:55:17 +08:00
xingchun-chen
57eee5695a Merge pull request #3331 from lenboo/dev-complement
[FIX-1336] [master] serial complement data can have multiple process instances
2020-07-29 16:08:36 +08:00
bao liang
1b98db9240 fix bug#1336 serial complement data can have multiple process instances (#3317)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
2020-07-28 13:59:22 +08:00
lenboo
48dc52a09a Merge branch '1.3.2-release' of github.com:apache/incubator-dolphinscheduler into 132 2020-07-28 13:58:32 +08:00
lgcareer
6b964be60a
[Feature][server]support one worker can belongs different worker groups when execute install script (#3307) 2020-07-28 10:55:35 +08:00
break60
88645dea1d
[bugFix][ui]Fix the log page refresh button does not rotate (#3316) 2020-07-27 15:21:34 +08:00
Yichao Yang
de819926e9 [Feature-2127][sql-schema] Fix the mysql version limited error (#2127) (#2915) 2020-07-23 15:26:25 +08:00
break60
71259db56b
[bugFix][ui]cherry pick commit from dev for Default assignment of delete condition judgment node (#3286)
* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted

* Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global

* Default assignment of delete condition judgment node
2020-07-23 10:19:49 +08:00
break60
a5cc686f49
[bugFix][ui]cherry pick commit from dev for Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global (#3284)
* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted

* Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global
2020-07-23 10:04:05 +08:00
break60
f668563c0c
[bugFix][ui] cherry pick commit from dev for When modifying the dag, if the DAG is not saved, it cannot be formatted (#3282)
* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted
2020-07-23 09:50:35 +08:00
break60
86c4f7ac64
[bugfix #3045][ui]cherry pick commit from dev for Delete the pid of the master and worker processes (#3280)
* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes
2020-07-23 09:32:59 +08:00
lgcareer
f854c5f794
[Feature-2815]cherry pick commit from dev for one worker can belong different worker groups (#3277)
* [Feature-2815]cherry pick commit from dev for one worker can belong to different worker groups

* fix 2975:download resource need find the tenant code of resource owner

* change NetUtils to OSUtils because NetUtils didn't exist in the 1.3.2-release branch

Co-authored-by: Yichao Yang <1048262223@qq.com>
2020-07-22 19:39:03 +08:00
break60
98f5991f1e
Click Cancel, the node data is restored to the original data (#3278) 2020-07-22 19:38:24 +08:00
xingchun-chen
f7badc2749
Merge pull request #3275 from break60/1.3.2-release
[Feature-3223][ui] cherry pick commit from dev for Click DAG connection to add label function
2020-07-22 17:55:30 +08:00
break60
d1b6e6c945 Click DAG connection to add label function 2020-07-22 15:35:32 +08:00
lenboo
572b142a53 [maven-release-plugin] prepare for next development iteration 2020-07-04 16:10:37 +08:00
lenboo
a4272efa55 [maven-release-plugin] prepare release 1.3.1 2020-07-04 16:04:36 +08:00
lenboo
fd3485ad0a revert version to 1.3.1 2020-07-04 15:54:37 +08:00
lgcareer
071437ffa4
add PropertyPlaceholderHelper on license (#3129)
* update license header location

* add PropertyPlaceholderHelper on license
2020-07-04 15:50:50 +08:00
dailidong
4a4e940379
fix Permission denied if not found dolphinscheder-env.sh on 1.3.1 (#3128)
* fix Permission denied if not found dolphinscheder-env.sh

* update some comments on method
2020-07-04 15:49:46 +08:00
bao liang
4817257c04
remove some notes (#3127)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
2020-07-04 15:42:53 +08:00
lgcareer
03dfba474e
update license header location (#3126) 2020-07-04 15:31:55 +08:00
lenboo
3d4d816349 [maven-release-plugin] prepare for next development iteration 2020-07-03 15:56:45 +08:00
lenboo
2ff94a4362 [maven-release-plugin] prepare release 1.3.1 2020-07-03 15:55:56 +08:00
satcblue
78c7dc104d fix dag zoom (#3103)
Co-authored-by: linhaojie <linhaojie@lizhi.fm>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: bao liang <29528966+lenboo@users.noreply.github.com>
2020-07-02 14:52:20 +08:00
lenboo
d7b768d157 Merge remote-tracking branch 'upstream/1.3.1-release' into 131 2020-07-02 14:52:05 +08:00
break60
5bfcdd2af1 [bugfix]Replace favicon icon with png and Cancel the initial value of the node cache #3111 (#3107)
* [bugfix]Replace favicon icon with png

* Cancel the initial value of the node cache
2020-07-02 14:50:58 +08:00
lgcareer
02e22e8a74
fix 3112:download udf resource need find the tenant code of resource owner (#3114)
* fix 3112:download udf resource need find the tenant code of resource owner

* fix 2975:download resource need find the tenant code of resource owner

* remove useless code
2020-07-02 14:42:22 +08:00
lgcareer
07a6aec1fc
fix 2975:download resource need find the tenant code of resource owner (#3109) 2020-07-01 19:04:03 +08:00
lgcareer
8e0dbd9848
remove some standard notices in order to cut down the NOTICE file. (#3101)
* #3084 remove some standard notices in order to cut down the NOTICE file.

* update exclude element sql/soft_version of rat plugin

* update soft_version
2020-07-01 10:44:43 +08:00
lgcareer
32b0dfd471
update ci from dev-1.3.0 (#3100) 2020-06-30 19:10:05 +08:00
liuhuijuan
24134f9271 fix release for nginx not package config files, eg: zookeeper.properties (#3041)
* fix release for nginx bug

* add state (#3040)

Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>

* [BUG_FIX]fix  multi-threaded tests error. (#3044)

* fix  test mock error

* fix  test mock error

Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>
Co-authored-by: CalvinKirs <acm_master@163.com>
2020-06-30 15:20:28 +08:00
break60
0f708737a8 Change favicon.ico icon introduction method and package compilation to increase version number (#3030) 2020-06-30 14:36:42 +08:00
zhangchunyang
3485f45db5 [feature] readme.md adds instructions for changing environment variables (#3031)
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
2020-06-30 14:18:34 +08:00
zhangchunyang
2031528add [bugfix] 1. fix alert.json includes repeated tag 'DOLPHIN_ALERT' 2. metainfo.xml The version number of the RPM package is no longer specified in the metainfo.xml (#3032)
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
2020-06-30 14:18:23 +08:00
zhangchunyang
0f8cb383a3 [bugfix] remove Conflicting configuration sudo and user (#3038)
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
2020-06-30 14:18:09 +08:00
dailidong
7445fa946b 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
2020-06-30 14:11:07 +08:00
gaojun2048
58897aa2c5 merge 1.3.0-release branch code 2020-06-29 18:42:26 +08:00
gaojun2048
3cf9afc195 merge 1.3.0-release branch code 2020-06-29 18:42:18 +08:00
break60
644dcbcdb1 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
2020-06-29 17:39:55 +08:00
gabry.wu
5222483471 Merge pull request #2898 from 597365581/patch-6
merge method updateuser if and fix bug#2892
2020-06-29 17:39:55 +08:00
break60
37fae4b920 Fixed selection of tenant value and defalut changed to lower case 2020-06-29 17:39:54 +08:00
lgcareer
9a5a818b13 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
2020-06-29 17:39:53 +08:00
lgcareer
38d28762bd add mybatis-3 notice in the top-level notice (#3003) 2020-06-29 17:39:53 +08:00
break60
86102b8950 Delete the pom files animation.scss, _normalize.scss and _animation.scss under the common folder 2020-06-29 17:39:53 +08:00
lenboo
c3879a7622 skip test for release 2020-06-29 17:39:51 +08:00