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 12/22: 1.12 --> 1.13 #3926

Merged
merged 16 commits into from
Dec 22, 2023
Merged

Upmerge 12/22: 1.12 --> 1.13 #3926

merged 16 commits into from
Dec 22, 2023

Commits on Nov 8, 2023

  1. Add the step of installing dependencies to the multi-app run steps in… 

    … the quickstart tutorial document. Add note for python3 problem in Windows environments.

Signed-off-by: İhsan Baran SÖNMEZ <ibaranson@gmail.com>
    @baransonmez
    baransonmez committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    ade6de8 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge branch 'v1.12' into update-multi-app-run-steps

    @hhunter-ms
    hhunter-ms committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    4293cde View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. include instructions on how to debug a local app that is part of a do… 

    …cker compose session (dapr#3881)
    @olitomlinson
    olitomlinson committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    3815827 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Merge branch 'v1.12' into update-multi-app-run-steps

    @baransonmez
    baransonmez committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    b989988 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

  1. Fix Subscription docs to match Kubernetes CRDs (dapr#3888) 

    Signed-off-by: gcaracuel <633810+gcaracuel@users.noreply.github.com>
    @gcaracuel
    gcaracuel committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    6460169 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Merge branch 'v1.12' into update-multi-app-run-steps

    @yaron2
    yaron2 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    276cc16 View commit details
    Browse the repository at this point in the history

  2. Fix method name 

    `startServer` method doesn't exist on JavaScript `DaprServer` (method name is `start` - see https://docs.dapr.io/developing-applications/sdks/js/js-server/#bindings-api)

Signed-off-by: Stuart Leeks <stuartle@microsoft.com>
    @stuartleeks
    stuartleeks committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    2bbff4b View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Merge pull request dapr#3894 from stuartleeks/patch-3 

    Fix method name
    @hhunter-ms
    hhunter-ms committed Dec 8, 2023
    2 Configuration menu
    Copy the full SHA
    28a97e1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v1.12' into update-multi-app-run-steps

    @baransonmez
    baransonmez committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    703e3f9 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Update dapr init CLI reference with Docker network examples (dapr#3901 

    )

* update dapr init doc

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

* Update daprdocs/content/en/reference/cli/dapr-init.md

Signed-off-by: Mark Fussell <markfussell@gmail.com>

---------

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
    @hhunter-ms @msfussell
    hhunter-ms and msfussell committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    149325b View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. cross link for debugging and viewing logs 

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

  2. add debug commands 

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

  3. Merge pull request dapr#3919 from hhunter-ms/issue_1614 

    Cross link for debugging and viewing logs
    @hhunter-ms
    hhunter-ms committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    e959735 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'v1.12' into update-multi-app-run-steps

    @hhunter-ms
    hhunter-ms committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    a487919 View commit details
    Browse the repository at this point in the history

  5. Merge pull request dapr#3861 from baransonmez/update-multi-app-run-steps 

    Deficiencies in the steps updated with the multi-app run feature that comes with v12
    @hhunter-ms
    hhunter-ms committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    1007192 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. last upmerge of 2023 

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