Skip to content

branch dev merge from dev-1.3.0#3087

Merged
lenboo merged 199 commits intodevfrom
dev-merge
Jun 30, 2020
Merged

branch dev merge from dev-1.3.0#3087
lenboo merged 199 commits intodevfrom
dev-merge

Conversation

@davidzollo
Copy link
Copy Markdown
Contributor

branch dev merge from dev-1.3.0

davidzollo and others added 30 commits April 25, 2020 11:23
Co-Authored-By: Jiajie Zhong <zhongjiajie955@hotmail.com>
* change schema version from 1.2.2 to 1.3.0

* change version value of table t_ds_version from 2.0.0 to 1.3.0
…) (#2656)

Co-authored-by: baoliang <baoliang@analysys.com.cn>
Repair worklist cannot be deleted #2650
Fix conditions node save exception #2649
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
add unique key for t_ds_process_definition
add unique key for t_ds_process_definition
add unique key for t_ds_process_definition
* script variable has "processDefinitionId" is error #2664

* blank in eamil and left font align  #2648

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* fix zookeeper health check and merge volumes into logs volume

1. Fix zookeeper health check
2. Merge volumes into logs volume
3. Modify `dockerfile/hooks/build` script

* Modify ci_e2e and docker image registry

* Modify ci_e2e

* Modify ci_e2e

* Modify ci_e2e and move ./dockerfile/hooks/check to ./docker/docker-swarm/
davidzollo and others added 21 commits June 19, 2020 14:45
* 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
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
…etainfo.xml The version number of the RPM package is no longer specified in the metainfo.xml (#3032)

Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
…les (#3031)

Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
# Conflicts:
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
@sonarqubecloud
Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 60 Code Smells

24.8% 24.8% Coverage
0.0% 0.0% Duplication

Copy link
Copy Markdown
Contributor

@lenboo lenboo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@lenboo lenboo merged commit ab6e431 into dev Jun 30, 2020
davidzollo added a commit that referenced this pull request Jun 30, 2020
davidzollo added a commit that referenced this pull request Jun 30, 2020
This reverts commit ab6e431.

Co-authored-by: dailidong <dailidong66@gmail.com>
@lenboo lenboo deleted the dev-merge branch July 7, 2020 06:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.