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

Update references for default branch rename #244

Merged
merged 1 commit into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,21 @@ make it embeddable into any tool or language.

## Releases

* The master branch is the current release and is considered stable at all
* The main branch is the current release and is considered stable at all
times.
* New versions can be released as frequently as every two weeks (our sprint
cycle). The only exception would be for a high priority patch.
* All active work is flagged with the sprint milestone and tracked in the
project dashboard.
* New releases occur the day after the sprint finishes.
* The version in the dev branch is updated
* The changes are merged into master
* The changes are merged into main
* A new tag is created

## Contributions

* All pull requests must be made against the dev branch, direct commits to
master are not permitted.
main are not permitted.
* All non trivial contributions should start with an issue being filed (if it is
a new feature please propose your design/approach before doing any work as not
all feature requests are accepted).
3 changes: 1 addition & 2 deletions docs/heka/output.md
Original file line number Diff line number Diff line change
Expand Up @@ -417,5 +417,4 @@ following values:
checkpoint to that specific message

#### Example Kafka Output
[kafka.lua](https://github.com/mozilla-services/lua_sandbox_extensions/blob/master/kafka/sandboxes/heka/output/kafka.lua)

[kafka.lua](https://github.com/mozilla-services/lua_sandbox_extensions/blob/main/kafka/sandboxes/heka/output/kafka.lua)