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.

Sign up for GitHub

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

Jump to bottom

fix getWorkers bug on RunConfig #2747

Merged
merged 11 commits into from
May 19, 2020
Merged

fix getWorkers bug on RunConfig #2747

merged 11 commits into from
May 19, 2020

Commits on May 14, 2020

  1. fix worker group config no effect

    @davidzollo
    davidzollo committed May 14, 2020
    Configuration menu
    Copy the full SHA
    74ef43d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev-1.3.0' into dev-1.3.0

    @davidzollo
    davidzollo committed May 14, 2020
    Configuration menu
    Copy the full SHA
    494d38a View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. remove codehaus janino jar 

    the license about janino maybe not compatiable with Apache v2
    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    240894c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 

    # Conflicts:
#	dolphinscheduler-server/src/main/resources/config/install_config.conf
    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    b2fac63 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 

    # Conflicts:
#	dolphinscheduler-server/src/main/resources/config/install_config.conf
    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    cbf6100 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/dev-1.3.0' into dev-1.3.0 

    # Conflicts:
#	dolphinscheduler-server/src/main/resources/config/install_config.conf
#	script/scp-hosts.sh
    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    25f3884 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0

    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    8ee72f6 View commit details
    Browse the repository at this point in the history

  6. datasource config

    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    6c7916a View commit details
    Browse the repository at this point in the history

  7. Update datasource.properties

    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    a06646a View commit details
    Browse the repository at this point in the history

  8. fix RunConfig bug

    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    af9b8c7 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/dev-1.3.0' into dev-1.3.0

    @davidzollo
    davidzollo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    7acf143 View commit details
    Browse the repository at this point in the history