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

Merge VTTOP and VTROOT variables, setting VTROOT to what was VTTOP #5382

Closed
wants to merge 31 commits into from
Closed

Merge VTTOP and VTROOT variables, setting VTROOT to what was VTTOP #5382

wants to merge 31 commits into from

Commits on Oct 30, 2019

  1. WIP 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f92d45a View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. Revert change of docker working dir 

    Remove mysql_flavor settings (do in different pr)

Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    dbeffa0 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2019

  1. Merge remote-tracking branch 'upstream/master' into morgo-remove-vttop 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    77baf22 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Test CI 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    1ffe423 View commit details
    Browse the repository at this point in the history

  2. Test ci with re-sourcing dev.env file 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    96c3ece View commit details
    Browse the repository at this point in the history

  3. test with destroy local and then link 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    d4a2e83 View commit details
    Browse the repository at this point in the history

  4. Attempt to fix vtroot 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    eb5b8da View commit details
    Browse the repository at this point in the history

  5. Attempt to fix vtroot 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    79ad6c1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'morgo-remove-vttop' of github.com:planetscale/vitess in… 

    …to morgo-remove-vttop

Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    a050c5a View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. Merge remote-tracking branch 'upstream/master' into morgo-remove-vttop 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    88f79bf View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2019

  1. Add make tools 

    Change parts of bootstrap to run in build.sh instead

Always execute build.sh as part of make build.

Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    a897c17 View commit details
    Browse the repository at this point in the history

  2. Make 'make test' work 

    Add dependency checking support.

Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    f90cc82 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Merge remote-tracking branch 'upstream/master' into morgo-remove-vttop 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    78bd499 View commit details
    Browse the repository at this point in the history

  2. Attempt unit test in new build style 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    9f5861a View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. Simplify docker/test/run.sh 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    abf6492 View commit details
    Browse the repository at this point in the history

  2. Turn caching off again 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    2f04bd8 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Change bootstrap to always run 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    1df5999 View commit details
    Browse the repository at this point in the history

  2. Updated detection of old bootstrap 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    f8a0b6d View commit details
    Browse the repository at this point in the history

  3. revert travis config 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    c94430b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into morgo-remove-vttop 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    d38fe11 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. Add symlinks 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    170f8c1 View commit details
    Browse the repository at this point in the history

  2. Fix PATH 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    ff17696 View commit details
    Browse the repository at this point in the history

  3. Fix docker test run 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    7ddd68e View commit details
    Browse the repository at this point in the history

  4. Fix docker test run 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    14850f7 View commit details
    Browse the repository at this point in the history

  5. Fix maven 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    cfbc092 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'morgo-remove-vttop' of github.com:planetscale/vitess in… 

    …to morgo-remove-vttop

Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    79d79a2 View commit details
    Browse the repository at this point in the history

  7. Found it! copying files in that should not have 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    da14904 View commit details
    Browse the repository at this point in the history

  8. Modify append_cmd to be ; instead of && 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    dd62182 View commit details
    Browse the repository at this point in the history

  9. move prepared statements to 5, restore && 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    22822e5 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2019

  1. Fix small bug in re-bootstrap case. 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    1ac0e52 View commit details
    Browse the repository at this point in the history

  2. Fix check if maven needs installing 

    Signed-off-by: Morgan Tocker <[email protected]>
    @morgo
    morgo committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    568b614 View commit details
    Browse the repository at this point in the history