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 single resource manager will NPE #3013

Merged
merged 31 commits into from
Jun 19, 2020
Merged

fix single resource manager will NPE #3013

merged 31 commits into from
Jun 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

Commits on May 20, 2020

  1. remove param monitor server state

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

Commits on May 29, 2020

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

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

Commits on May 30, 2020

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

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

Commits on May 31, 2020

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

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

Commits on Jun 1, 2020

  1. fix table T_DS_ALERT

    @davidzollo
    davidzollo committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    66d8896 View commit details
    Browse the repository at this point in the history

  2. update h2 database

    @davidzollo
    davidzollo committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    8e41081 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

    @davidzollo
    davidzollo committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    bbf8253 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2020

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

    @davidzollo
    davidzollo committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    529bec1 View commit details
    Browse the repository at this point in the history

  2. fix #2910 master server will show exception for some time when it res… 

    …tart
    @davidzollo
    davidzollo committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    78068be View commit details
    Browse the repository at this point in the history

  3. fix oom when no master is active

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

Commits on Jun 7, 2020

  1. fix worker oom when master server restart

    @davidzollo
    davidzollo committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    022f50f 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 Jun 7, 2020
    Configuration menu
    Copy the full SHA
    e0d3890 View commit details
    Browse the repository at this point in the history

  3. fix oom

    @davidzollo
    davidzollo committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    f64cdc8 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

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

Commits on Jun 8, 2020

  1. fix

    @davidzollo
    davidzollo committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    0af890e View commit details
    Browse the repository at this point in the history

  2. add UT

    @davidzollo
    davidzollo committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    7e7adc0 View commit details
    Browse the repository at this point in the history

  3. fix worker group config no effect

    @davidzollo
    davidzollo committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    9fc1102 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2020

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

    @davidzollo
    davidzollo committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    e2ceb0e View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. fix singe resource manager will NPE

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

  2. Update HadoopUtilsTest.java

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