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

Merge 'main' back into 'dev' so the branches are in sync #262

Merged
merged 30 commits into from
Oct 11, 2023
Merged

Conversation

russelltrow
Copy link
Member

The dev branch is currently behind main as some changes happened directly on main.

PR is to get them back in sync.

dubrie and others added 26 commits November 9, 2022 19:50
Add additional description field to template
Removing Tammy as per her request 
@tamigraph fyi
Moving to the top of the page those who have been actively contributing to our discussions recently.
Removing SMEs who have not been actively contributing to the project lately. We may add their names back any time once they become active.
<TeamMember github="alex-kroll">Alexander Kroll</TeamMember>
<TeamMember github="bderusha">Bill DeRusha</TeamMember>
<TeamMember github="danielvaughn">Daniel Vaughn</TeamMember>
<TeamMember github="marcoshidalgonunes">Marcos Hidalgo Nunes</TeamMember>
<TeamMember github="srini1978">Srinivasan Rakhunathan</TeamMember>
I, Markus Seidl <[email protected]>, hereby add my Signed-off-by to this commit: f3462fa
I, Markus Seidl <[email protected]>, hereby add my Signed-off-by to this commit: b415845
I, Markus Seidl <[email protected]>, hereby add my Signed-off-by to this commit: cf90eb2

Signed-off-by: Markus Seidl <[email protected]>
I, Markus Seidl <[email protected]>, hereby add my Signed-off-by to this commit: 1e7d982

Signed-off-by: Markus Seidl <[email protected]>
Updated project meeting template to reflect current format

Signed-off-by: Russell Trow <[email protected]>
Updated agenda format to be more action-orientated

Signed-off-by: Russell Trow <[email protected]>
for typo #240 Fix grammatical error in guide/index.md
Fix typo in scale-kubernetes-workloads-based-on-events.md
Resolving issue #228 by amending the Docusaurus config editUrl property

Signed-off-by: Russell Trow <[email protected]>
Added description & publish date to "cloud/use-circuit-breaker" pattern

Signed-off-by: Russell Trow <[email protected]>
@russelltrow
Copy link
Member Author

@greenhsu123 would you mind reviewing this for me please.

Signed-off-by: Russell Trow <[email protected]>
Added OKR/KPI section

Signed-off-by: Russell Trow <[email protected]>
@russelltrow russelltrow added the bug Something isn't working label Oct 5, 2023
@markus-gsf-seidl
Copy link
Contributor

I think all new patterns should go in dev and then, via a 2nd review which may be more like "adjust the language to english standards" to the main branch.

@russelltrow
Copy link
Member Author

I think all new patterns should go in dev and then, via a 2nd review which may be more like "adjust the language to english standards" to the main branch.

I agree, I have spoken with @catherinemaughan and she can help with the language review once a pattern is in Dev.

@markus-gsf-seidl
Copy link
Contributor

This PR looks good to me @russelltrow

@russelltrow russelltrow merged commit 3a7f52b into dev Oct 11, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants