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 10/11 - v1.11 --> v1.12 #3816

Merged
merged 35 commits into from
Oct 11, 2023
Merged

Upmerge 10/11 - v1.11 --> v1.12 #3816

merged 35 commits into from
Oct 11, 2023

Commits on Sep 18, 2023

  1. update schema with values 

    Signed-off-by: Hannah Hunter <[email protected]>
    @hhunter-ms
    hhunter-ms committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    79dca65 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Add holopin.yml (dapr#3747) 

    This will allow us to award contributors with a Holopin badge during the GHC2023 event.

Signed-off-by: Marc Duiker <[email protected]>
    @marcduiker
    marcduiker authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    51dc81b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v1.11' into issue_3638

    @msfussell
    msfussell authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    8549c16 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Update pubsub-quickstart.md 

    .NET app is running on port 7006.

Signed-off-by: niakamk <[email protected]>
    @niakamk
    niakamk authored Sep 21, 2023
    Configuration menu
    Copy the full SHA
    da48b4c View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Merge pull request dapr#3753 from niakamk/patch-1 

    Update pubsub-quickstart.md
    @hhunter-ms
    hhunter-ms authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    7b93fcc View commit details
    Browse the repository at this point in the history

  2. Description of DAPR_HOST_IP is missing in docs dapr#1852 

    Signed-off-by: dollysah <[email protected]>
    @dollysah
    dollysah authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    715729e View commit details
    Browse the repository at this point in the history

  3. Merge pull request dapr#3761 from dollysah/patch-1 

    Description of DAPR_HOST_IP is missing in docs dapr#1852
    @hhunter-ms
    hhunter-ms authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    b824545 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'v1.11' into issue_3638

    @msfussell
    msfussell authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    1da77a3 View commit details
    Browse the repository at this point in the history

  5. Updated configuration_api.md 

    Changed the Configuration API response from an array to dictionary

Signed-off-by: Sri Lasya Malladi <[email protected]>
    @srilasya02
    srilasya02 authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    762a349 View commit details
    Browse the repository at this point in the history

  6. Merge pull request dapr#3762 from srilasya02/configapi-docs-changes 

    Updated configuration_api.md
    @hhunter-ms
    hhunter-ms authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    f3cb664 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. Merge branch 'v1.11' into issue_3638

    @msfussell
    msfussell authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    97d323b View commit details
    Browse the repository at this point in the history

  2. Added errorIfNot2XX option to HTTP binding docs (dapr#3741) 

    * Added errorIfNot2XX option to HTTP binding docs

Signed-off-by: Wim Vande Casteele <[email protected]>

* Update daprdocs/content/en/reference/components-reference/supported-bindings/http.md

Signed-off-by: Mark Fussell <[email protected]>

---------

Signed-off-by: Wim Vande Casteele <[email protected]>
Signed-off-by: Mark Fussell <[email protected]>
Co-authored-by: Hannah Hunter <[email protected]>
Co-authored-by: Mark Fussell <[email protected]>
    @wimvc1 @hhunter-ms @msfussell
    3 people authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    5de4fdf View commit details
    Browse the repository at this point in the history

  3. Update daprdocs/content/en/reference/resource-specs/component-schema.md 

    Co-authored-by: Mark Fussell <[email protected]>
Signed-off-by: Hannah Hunter <[email protected]>
    @hhunter-ms @msfussell
    hhunter-ms and msfussell authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    e2a4f64 View commit details
    Browse the repository at this point in the history

  4. Update daprdocs/content/en/reference/resource-specs/component-schema.md 

    Co-authored-by: Mark Fussell <[email protected]>
Signed-off-by: Hannah Hunter <[email protected]>
    @hhunter-ms @msfussell
    hhunter-ms and msfussell authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    eb1c778 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1.11' into issue_3638

    @hhunter-ms
    hhunter-ms authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    e2b6321 View commit details
    Browse the repository at this point in the history

  6. link to example 

    Signed-off-by: Hannah Hunter <[email protected]>
    @hhunter-ms
    hhunter-ms committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    836c353 View commit details
    Browse the repository at this point in the history

  7. typo in example in httpendpoints-schema.md (dapr#3764) 

    Signed-off-by: Alexey <[email protected]>
    @Kuzbekov
    Kuzbekov authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    ad4f496 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'v1.11' into issue_3638

    @msfussell
    msfussell authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    0880798 View commit details
    Browse the repository at this point in the history

  9. Merge pull request dapr#3743 from hhunter-ms/issue_3638 

    Update component schema with current values
    @hhunter-ms
    hhunter-ms authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    e9e3f72 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Fixed bad link cited in issue dapr#3766 

    Signed-off-by: Whit Waldo <[email protected]>
    @WhitWaldo
    WhitWaldo committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    3f8a45b View commit details
    Browse the repository at this point in the history

  2. Merge pull request dapr#3767 from WhitWaldo/wwaldo-1 

    Fixed bad link cited in issue dapr#3766
    @hhunter-ms
    hhunter-ms authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    d78600e View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Jaeger OpenTelemetry docs (dapr#3727) 

    * Jaeger OpenTelemetry docs

Signed-off-by: Alice Gibbons <[email protected]>

* Apply suggestions from code review

Co-authored-by: Hannah Hunter <[email protected]>
Signed-off-by: Alice Gibbons <[email protected]>
Signed-off-by: Alice Gibbons <[email protected]>

---------

Signed-off-by: Alice Gibbons <[email protected]>
Signed-off-by: Alice Gibbons <[email protected]>
Co-authored-by: Hannah Hunter <[email protected]>
    @alicejgibbons @hhunter-ms
    alicejgibbons and hhunter-ms authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    9af6270 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Jaeger otlp updates (dapr#3771) 

    Signed-off-by: Alice Gibbons <[email protected]>
    @alicejgibbons
    alicejgibbons authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    7ed281a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Jaeger otlp updates (dapr#3771) 

    Signed-off-by: Alice Gibbons <[email protected]>
Signed-off-by: shruthiragu <[email protected]>
    @alicejgibbons @shruthiragu
    alicejgibbons authored and shruthiragu committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    8a43ae5 View commit details
    Browse the repository at this point in the history

  2. Updated app ports in JS and Go Pubsub Quickstart (dapr#3579) 

    Updated app ports in Javascript and Go Pubsub Quickstart documentation and fixed typo in actors-timers-reminders building block

Signed-off-by: Shruthi Parthasarathy <[email protected]>
Signed-off-by: shruthiragu <[email protected]>
    @shruthiragu
    shruthiragu committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    7d90906 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'v1.11' into update-app-port

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

  4. Merge pull request dapr#3779 from shruthiragu/update-app-port 

    Update app port
    @hhunter-ms
    hhunter-ms authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    0accc68 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. fix invalid python syntax for pubsub cloud events (dapr#3786) 

    make the publish_metadata fields valid python

Signed-off-by: Thomas Klinger <[email protected]>
    @thomasklinger1234
    thomasklinger1234 authored Oct 5, 2023
    Configuration menu
    Copy the full SHA
    8db1846 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Update diagram deck (dapr#3768) 

    * update diagram deck

Signed-off-by: Hannah Hunter <[email protected]>

* updates

Signed-off-by: Hannah Hunter <[email protected]>

* add crypto images

Signed-off-by: Hannah Hunter <[email protected]>

---------

Signed-off-by: Hannah Hunter <[email protected]>
Co-authored-by: Mark Fussell <[email protected]>
    @hhunter-ms @msfussell
    hhunter-ms and msfussell authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    7fece60 View commit details
    Browse the repository at this point in the history

  2. fix link 

    Signed-off-by: Hannah Hunter <[email protected]>
    @hhunter-ms
    hhunter-ms committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    ac04a0f View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Merge branch 'v1.12' of https://github.com/dapr/docs into v1.12

    @hhunter-ms
    hhunter-ms committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    9defe31 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge branch 'v1.12' of https://github.com/dapr/docs into v1.12

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

Commits on Oct 11, 2023

  1. Merge branch 'v1.12' of https://github.com/dapr/docs into v1.12

    @hhunter-ms
    hhunter-ms committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    f5f8582 View commit details
    Browse the repository at this point in the history

  2. resolve conflicts 

    Signed-off-by: Hannah Hunter <[email protected]>
    @hhunter-ms
    hhunter-ms committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    04b2e80 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'v1.12' into upmerge_10-11

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