Skip to content

Commit

Permalink
chore: resolve merge conflicts with master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
char0n committed Sep 13, 2022
2 parents 03f80ad + 9f37dd8 commit 46514d0
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 53 deletions.
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ Release X.X.X is scheduled for XXXX
### Release notes:
* draft PR - https://github.com/asyncapi/website/pull/PULLREQUEST

### Potential work to be included in this version

#### Accepted

- [ ]

#### Pending

- [ ]

#### Discarded

- [ ]

### Progress:
- [ ] Create release branches
- [ ] spec
Expand Down Expand Up @@ -59,3 +73,7 @@ Release X.X.X is scheduled for XXXX
- [ ] spec-json-schemas
- [ ] parser-js
- [ ] Update RELEASE_PROCESS doc with any changes

### Cleanup tasks after the release

- [ ]
2 changes: 1 addition & 1 deletion .github/workflows/link-check-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
fields: repo,action,workflow
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
if: failure() # Only, on failure, send a message on the Slack Docs Channel (if there are broken links)
if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
5 changes: 3 additions & 2 deletions .github/workflows/stale-issues-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Mark issue or PR as stale
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4.0.0
- uses: actions/stale@v5.1.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: |
Expand Down Expand Up @@ -41,4 +41,5 @@ jobs:
stale-issue-label: stale
stale-pr-label: stale
exempt-issue-labels: keep-open
exempt-pr-labels: keep-open
exempt-pr-labels: keep-open
close-issue-reason: not_planned
7 changes: 4 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -178,15 +179,15 @@
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright The Linux Foundation
Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -198,4 +199,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
2 changes: 2 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
AsyncAPI Initiative
Copyright The Linux Foundation
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
## Read the specification

The latest draft specification can be found at [spec/asyncapi.md](./spec/asyncapi.md) which tracks the latest commit to the master branch in this repository.
The human-readable markdown file is the source of truth for the specification.

- [Version 2.5.0](https://github.com/asyncapi/spec/blob/v2.5.0/spec/asyncapi.md) (latest)
- [Version 2.4.0](https://github.com/asyncapi/spec/blob/v2.4.0/spec/asyncapi.md)
Expand Down
15 changes: 12 additions & 3 deletions examples/streetlights-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@ info:
url: https://www.apache.org/licenses/LICENSE-2.0

servers:
test:
url: test.mykafkacluster.org:8092
scram-connections:
url: test.mykafkacluster.org:18092
protocol: kafka-secure
description: Test broker
description: Test broker secured with scramSha256
security:
- saslScram: []
mtls-connections:
url: test.mykafkacluster.org:28092
protocol: kafka-secure
description: Test broker secured with X509
security:
- certs: []

defaultContentType: application/json

Expand Down Expand Up @@ -139,6 +145,9 @@ components:
saslScram:
type: scramSha256
description: Provide your username and password for SASL/SCRAM authentication
certs:
type: X509
description: Download the certificate files from service provider

parameters:
streetlightId:
Expand Down
93 changes: 49 additions & 44 deletions spec/asyncapi.md

Large diffs are not rendered by default.

0 comments on commit 46514d0

Please sign in to comment.