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

Main merge 1.0.4 #666

Merged
merged 9 commits into from
Jun 7, 2024
Merged

Main merge 1.0.4 #666

merged 9 commits into from
Jun 7, 2024

Commits on May 30, 2024

  1. add proxy fields to host.vN config types

    @scareything
    scareything committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ce1513b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Merge pull request #656 from openziti/merge-main-to-1.x 

    Merge main to 1.x
    @ekoby
    ekoby authored May 31, 2024
    Configuration menu
    Copy the full SHA
    bdf8be2 View commit details
    Browse the repository at this point in the history

  2. declare proxy type enum

    @scareything
    scareything committed May 31, 2024
    Configuration menu
    Copy the full SHA
    71717f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Merge pull request #653 from openziti/hostv1.proxy 

    add proxy fields to host.vN config types
    @ekoby
    ekoby authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    6184726 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. update [email protected]

    @ekoby
    ekoby committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1f74f24 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. do not request services if controller is down

    @ekoby
    ekoby committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    0e8f46f View commit details
    Browse the repository at this point in the history

  2. run CI build on release-* PRs

    @ekoby
    ekoby committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    20dac07 View commit details
    Browse the repository at this point in the history

  3. update [email protected]

    @ekoby
    ekoby committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    1ef8211 View commit details
    Browse the repository at this point in the history

  4. Merge tag '1.0.4' into main-merge-1.0.4

    @ekoby
    ekoby committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    989754a View commit details
    Browse the repository at this point in the history