Skip to content

merge from apache dev#7

Merged
brave-lee merged 200 commits intobrave-lee:devfrom
apache:dev
Jun 30, 2020
Merged

merge from apache dev#7
brave-lee merged 200 commits intobrave-lee:devfrom
apache:dev

Conversation

@brave-lee
Copy link
Copy Markdown
Owner

Tips

What is the purpose of the pull request

(For example: This pull request adds checkstyle plugin.)

Brief change log

(for example:)

  • Add maven-checkstyle-plugin to root pom.xml

Verify this pull request

(Please pick either of the following options)

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(example:)

  • Added dolphinscheduler-dao tests for end-to-end.
  • Added CronUtilsTest to verify the change.
  • Manually verified the change by testing locally.

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/
break60 and others added 27 commits June 15, 2020 20:53
* add mybatis-3 notice in the top-level notice

* fix download resource file that under the directory error
…e parameters (#3008)

* Change email to default

* Fix unfiltered jar files in resource directory and UDF upload resource parameters
* 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
branch dev merge from dev-1.3.0
@brave-lee brave-lee merged commit 11e0e93 into brave-lee:dev Jun 30, 2020
brave-lee pushed a commit that referenced this pull request Jan 12, 2021
update code from apache
brave-lee pushed a commit that referenced this pull request Jan 12, 2021
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.