Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test rebase 1 #3075

Merged
merged 207 commits into from
Jun 29, 2020
Merged

Test rebase 1 #3075

merged 207 commits into from
Jun 29, 2020

Conversation

EricJoy2048
Copy link
Member

rebase 2

davidzollo and others added 30 commits June 29, 2020 17:36
* add environment variables add checkpoint.sh file to docker image

1. add `POSTGRESQL_DATABASE` environment variable
2. add `DOLPHINSCHEDULER_DATA_BASEDIR_PATH` environment variable
3. add `DOLPHINSCHEDULER_DATA_DOWNLOAD_BASEDIR_PATH` environment variable
4. add `DOLPHINSCHEDULER_PROCESS_EXEC_BASEPATH` environment variable
5. add checkpoint.sh file to check server process
6. modify `README.md` and `README_zh_CN.md`

* add environment variables add checkpoint.sh file to docker image

1. add `POSTGRESQL_DATABASE` environment variable
2. add `DOLPHINSCHEDULER_DATA_BASEDIR_PATH` environment variable
3. add `DOLPHINSCHEDULER_DATA_DOWNLOAD_BASEDIR_PATH` environment variable
4. add `DOLPHINSCHEDULER_PROCESS_EXEC_BASEPATH` environment variable
5. add checkpoint.sh file to check server process
6. modify `README.md` and `README_zh_CN.md`

* add logger port and modify dolphinscheduler_env to dolphinscheduler_env.sh
…#1999)

* Adapting partial code(file name start with E) to the sonar cloud rule

* remove isEmpty invoke

* resolve conflicts
…#2045)

* Adapting partial code(file name start with F) to the sonar cloud rule

* add more unit test

* add License

* add includes configuration to maven-surefire-plugin

* fix getResourceFilesList incorrect logic
Co-authored-by: guirong.ggr <guirong.ggr@dtwave-inc.com>
Co-authored-by: guirong.ggr <guirong.ggr@dtwave-inc.com>
* docker run failed when docker command was `docker run -d`

1. add tini
2. replace `tee` command by `tail` command in startup.sh
3. api-server need to support zookeeper

* modify `check.sh` in dockerfile

* add init directories and log files
* Add mail server configuration description information

* Remove mail server configuration note in alert.properties
…2141)

* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines
Co-authored-by: zhukai <zhukai@ygsoft.com>
* fix bug: data to long for app_link field

* change app_link field length in 1.2.2 ddl

* change app_link field type to text
* Update quick-start.md

* 更新demo的地址

* add rpm plugin

* delete the git ignore files

* 测试git ignore

* 测试ignore

* optimize the .gitignore file

* add rpm package, delete unuse copy jar action in assembly

* delete docs dir

* add rpm plugin support

* add rpm plugin support

* add rpm plugin support

* dolphinscheduler-common have not bin dir

* dolphinscheduler-common have not bin dir

* delete unuse config about assembly

* add defineSatement

* add rpm plugin support

* add rpm plugin support

* add rpm plugin support

* add rpm support

* update install dirname , make front and backend together

* update rpm name

* update rpm name

* update rpm config

* add jars excludes

* add jars excludes

* add rpm plugion

* add rpm plugion

* add rpm plugion

* add auto create /opt/soft

* The install dir can not be fixed to apache-dolphinscheduler-incubating-1.2.1 , its version is 1.2.2

* install from rpm will create a link

* the ui install thrown rpm only support jetty not nginx

* the ui install thrown rpm only support jetty not nginx

* sql目录里加上soft_version文件

* env dir need in conf dir

* remove no use module

* add module

* updaate

* rpmbuild add dolphinscheduler-service module
* Toolbar of the DAG has not prompt

* Remove duplication code
davidzollo and others added 29 commits June 29, 2020 17:39
* 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
Co-authored-by: chenxingchun <438044805@qq.com>
…scription of the replication plug-in directory (#2786)
* Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory

* fixed #2788
…ponents on nodes (#2806)

* delete unnecessary configuration items

* Added instructions for ambari to add and remove Dolphin Schdumer components on nodes

* Added instructions for ambari to add and remove Dolphin Schdumer components on nodes
* add source license full text into source license

* exclude ScriptRunner.java on rat check
* add source license full text into source license

* exclude ScriptRunner.java on rat check

* change notice copyright date from 2019 to 2019-2020
* fix bug: send task result to master until success.

* fix bug: send task result to master until success.

* add sleep

* set null if send result failed

* set null if send result failed

* change max length of username to 39

Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix bug: sqoop mysql import params error

* fix bug: sqoop mysql import params error
fix create table sql exception
* add mybatis-3 notice in the top-level notice

* fix download resource file that under the directory error
merge method updateuser if and fix bug#2892
…e parameters (#3008)

* Change email to default

* Fix unfiltered jar files in resource directory and UDF upload resource parameters
@EricJoy2048 EricJoy2048 merged commit 1dfe878 into apache:1.3.1-release Jun 29, 2020
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.

None yet