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.

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

Release 1.6 #525

Merged
merged 3 commits into from
Jan 25, 2022
Merged

Release 1.6 #525

merged 3 commits into from
Jan 25, 2022

Conversation

dmitsh
Copy link
Contributor

@dmitsh dmitsh commented Jan 24, 2022

Description

merge release-1.6 branch with master

Issue reference

We strive to have all PRs being opened based on an issue, where the problem or feature have been discussed prior to implementation.

Please reference the issue this PR will close: #[issue number]

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

  • The quickstart code compiles correctly
  • You've tested new builds of the quickstart if you changed quickstart code
  • You've updated the quickstart's README if necessary
  • If you have changed the steps for a quickstart be sure that you have updated the automated validation accordingly. All of our quickstarts have annotations that allow them to be executed automatically as code. For more information see mechanical-markdown. For user guide with examples see Examples.

@dmitsh dmitsh force-pushed the release-1.6 branch 2 times, most recently from 4972dc1 to 79946fa Compare January 24, 2022 22:48
dmitsh and others added 3 commits January 24, 2022 14:55
…trol Center on MacOS (#521)

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@gmail.com>
* Make sure the client is actual built (#517)

Signed-off-by: Xavier Geerinck <xavier.geerinck@gmail.com>

* Update DevContainer base image to fix CodeSpaces and DevContainer issues (#519)

* Update base image to later Universal 1.x Focal, but still pin to 1.x major version

Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com>

* Updated readme to clarify pre-req SKUs for GitHub CodeSpaces support

Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com>

Co-authored-by: Mukundan Sundararajan <musundar@microsoft.com>

* Setting FLASK_RUN_PORT=5001 in distributed-calc

Signed-off-by: Charlie Stanley <wistanle@microsoft.com>

Co-authored-by: Xavier Geerinck <xavier.geerinck@gmail.com>
Co-authored-by: Paul Yuknewicz <paulyuk@microsoft.com>
Co-authored-by: Mukundan Sundararajan <musundar@microsoft.com>
Co-authored-by: Charlie Stanley <wistanle@microsoft.com>
Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@gmail.com>
Copy link
Member

@msfussell msfussell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@msfussell msfussell merged commit 68da2d8 into master Jan 25, 2022
@dmitsh dmitsh deleted the release-1.6 branch January 25, 2022 03:26
@dmitsh dmitsh restored the release-1.6 branch January 25, 2022 03:27
Arashrohani pushed a commit to Arashrohani/quickstarts that referenced this pull request Feb 16, 2022
* replace ports 5000/7000 with 5001/7001 to eliminate conflict with Control Center on MacOS (dapr#521)

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@gmail.com>

* Sync master into release-1.6 (dapr#523)

* Make sure the client is actual built (dapr#517)

Signed-off-by: Xavier Geerinck <xavier.geerinck@gmail.com>

* Update DevContainer base image to fix CodeSpaces and DevContainer issues (dapr#519)

* Update base image to later Universal 1.x Focal, but still pin to 1.x major version

Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com>

* Updated readme to clarify pre-req SKUs for GitHub CodeSpaces support

Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com>

Co-authored-by: Mukundan Sundararajan <musundar@microsoft.com>

* Setting FLASK_RUN_PORT=5001 in distributed-calc

Signed-off-by: Charlie Stanley <wistanle@microsoft.com>

Co-authored-by: Xavier Geerinck <xavier.geerinck@gmail.com>
Co-authored-by: Paul Yuknewicz <paulyuk@microsoft.com>
Co-authored-by: Mukundan Sundararajan <musundar@microsoft.com>
Co-authored-by: Charlie Stanley <wistanle@microsoft.com>

* update README (dapr#524)

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@gmail.com>

Co-authored-by: Charlie Stanley <charlie.stanley@microsoft.com>
Co-authored-by: Xavier Geerinck <xavier.geerinck@gmail.com>
Co-authored-by: Paul Yuknewicz <paulyuk@microsoft.com>
Co-authored-by: Mukundan Sundararajan <musundar@microsoft.com>
Co-authored-by: Charlie Stanley <wistanle@microsoft.com>
Signed-off-by: Arash Rohani <arash.rohani@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants