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

Upmerge 1.11 --> 1.12 #3973

Merged
merged 10 commits into from
Jan 26, 2024
Merged

Upmerge 1.11 --> 1.12 #3973

merged 10 commits into from
Jan 26, 2024

Commits on Sep 20, 2023

  1. update 1.11 docs branch for release 

    Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
    @hhunter-ms
    hhunter-ms committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    27e481b View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge branch 'v1.11' into endgame_v1.11

    @hhunter-ms
    hhunter-ms authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    47b9d7d View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Merge pull request dapr#3751 from hhunter-ms/endgame_v1.11 

    [Endgame] Prep v1.11 branch for 1.12 release
    @hhunter-ms
    hhunter-ms authored Oct 11, 2023
    Configuration menu
    Copy the full SHA
    c482024 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. update s3 bindings links (dapr#3782) 

    * update s3 bindings links

Signed-off-by: Ilia Stepin <stepinilya@gmail.com>

* Update s3.md

Signed-off-by: Ilia Stepin <stepinilya@gmail.com>

---------

Signed-off-by: Ilia Stepin <stepinilya@gmail.com>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
    @martbln @yaron2
    martbln and yaron2 authored Oct 17, 2023
    Configuration menu
    Copy the full SHA
    f0ef4b9 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. 1.11 update supported releases up to 1.11.6 

    Signed-off-by: joshvanl <me@joshvanl.dev>
    @JoshVanL
    JoshVanL committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    d9ee1f3 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. v1.11 fix links (dapr#3877) 

    * fix link

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

* try again with link

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

* pub-sub

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

---------

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Co-authored-by: Hannah Hunter <hannahhunter@microsoft.com>
    @JoshVanL @hhunter-ms
    JoshVanL and hhunter-ms authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d68b3bc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v1.11' into v1.11-supported-releases-1.11.6

    @msfussell
    msfussell authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    b814217 View commit details
    Browse the repository at this point in the history

  3. Merge pull request dapr#3874 from JoshVanL/v1.11-supported-releases-1… 

    ….11.6

1.11 update supported releases up to 1.11.6
    @hhunter-ms
    hhunter-ms authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    60f4fe3 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. resolve merge conflict 

    Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
    @hhunter-ms
    hhunter-ms committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    d600ba6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v1.12' into upmerge_01-26b

    @hhunter-ms
    hhunter-ms authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    fdca99f View commit details
    Browse the repository at this point in the history