branch dev merge from dev-1.3.0 #3087
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
Dev 1.3.0
add unique key for t_ds_process_definition
add unique key for t_ds_process_definition
add unique key for t_ds_process_definition
Modify the alert log file
* 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/
* 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
…o increase version number (#3030)
|
Kudos, SonarCloud Quality Gate passed!
|
davidzollo
added a commit
that referenced
this pull request
Jun 30, 2020
This reverts commit ab6e431.
This was referenced Jun 30, 2020
davidzollo
added a commit
that referenced
this pull request
Jun 30, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
branch dev merge from dev-1.3.0