Skip to content

Commit 435ade4

Browse files
authored
Merge pull request firecracker-microvm#499 from RoyceDavison/rename-branch
Rename branch
2 parents f320d36 + f9c33e1 commit 435ade4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
2323
## Contributing via Pull Requests
2424
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
2525

26-
1. You are working against the latest source on the *master* branch.
26+
1. You are working against the latest source on the *main* branch.
2727
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
2828
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
2929

@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
5656

5757
## Licensing
5858

59-
See the [LICENSE](https://github.com/firecracker-microvm/firecracker-containerd/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
59+
See the [LICENSE](https://github.com/firecracker-microvm/firecracker-containerd/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
6060

6161
We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

docs/scaling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ To configure system-wide, uncomment and set `DefaultTasksMax=infinity`in `/etc/s
4646
One also needs to set `UsersTasksMax=4000000000` in `/etc/systemd/logind.conf`
4747
(note that `infinity` is not a valid value here).
4848

49-
To configure the bridges for CNI, take a look at `demo-network` target in [Makefile](https://github.com/firecracker-microvm/firecracker-containerd/blob/master/Makefile)
49+
To configure the bridges for CNI, take a look at `demo-network` target in [Makefile](https://github.com/firecracker-microvm/firecracker-containerd/blob/main/Makefile)
5050
and replicate the code to create enough bridges (1 bridge can have up to 1023 interfaces attached).

0 commit comments

Comments
 (0)