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

feat: update next-major-spec with master #284

Closed

jonaslagoni wants to merge 16 commits into next-major-spec from master

Member

jonaslagoni commented Nov 6, 2022

Description
This PR merges master into next-major-spec.

char0n and others added 14 commits

September 29, 2022 09:01


          feat: release for version 2.5.0 of the spec (#265)

652c200

Co-authored-by: Sergio Moya <1083296+smoya@users.noreply.github.com>
Co-authored-by: asyncapi-bot <bot+chan@asyncapi.io>
Co-authored-by: asyncapi-bot-eve <bot+eve@asyncapi.io>
Co-authored-by: Jeremy Whitlock <jwhitlock@apache.org>
Co-authored-by: derberg <lpgornicki@gmail.com>


          chore(release): v3.2.0 (#268)

6dbc2b1


          fix: add AsyncAPI v2.5.0 schema to the all.schema-store.json doc. (#269)

b2bbe09


          chore(release): v3.2.1 (#270)

ac8b697


          chore: add Sergio and Vladimir as code owners (#271)

0f51bb9


          ci: update generic workflows (#274)

52b13da


          ci: update generic workflows (#276)

0c4b0b3


          chore(deps): bump dot-prop and conventional-changelog-angular (#277)

ba0f516


          feat!: remove unsupported specs from NodeJS export (#248)

f55917d

Co-authored-by: Sergio Moya <1083296+smoya@users.noreply.github.com>


          chore(release): v4.0.0 (#278)

dd5966c


          ci: update generic workflows (#279)

7e249d7


          refactor: update schema to resolve reference property issue (#275)

5f7edd3


          ci: update generic workflows (#281)

daa885c


          chore(deps): bump @actions/core from 1.6.0 to 1.9.1 in /.github/workf…

77c40b5

…lows/scripts/mailchimp (#282)

jonaslagoni requested review from fmvilas, derberg, dalelane and asyncapi-bot-eve as code owners

November 6, 2022 01:23

Member Author

jonaslagoni commented Nov 6, 2022

I can't quite figure out how I can merge master into next-major-spec and solve the conflicts with local branches 🤔

Any suggestion?

jonaslagoni mentioned this pull request

feat: add binding validation #239

Merged

asyncapi-bot and others added 2 commits

November 9, 2022 19:51


          ci: update generic workflows (#285)

b2c64eb


          ci: remove not needed workflow (#286)

14ecce9

sonarcloud bot commented Nov 14, 2022

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

Member

fmvilas commented Nov 21, 2022

I can't quite figure out how I can merge master into next-major-spec and solve the conflicts with local branches 🤔

Any suggestion?

What exactly is your problem? What can't you figure out? I'm happy to help but need to know better what kind of problem you're having.

Member Author

jonaslagoni commented Nov 21, 2022

@fmvilas solved in #289

jonaslagoni closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

fmvilas Awaiting requested review from fmvilas fmvilas is a code owner

derberg Awaiting requested review from derberg derberg is a code owner

dalelane Awaiting requested review from dalelane dalelane is a code owner

asyncapi-bot-eve Awaiting requested review from asyncapi-bot-eve asyncapi-bot-eve is a code owner