Skip to content

Commit c3b8ae8

Browse files
authored
Rename master branch to main (#427)
* rename master to main * update links
1 parent 3a0f59d commit c3b8ae8

10 files changed

+17
-17
lines changed

.changes/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ After a release, the changelog will be initialized with the following template:
2424
```
2525
## $VERSION (Unreleased)
2626
27-
Changes in progress for v$VERSION are available at [.changes/v$VERSION](https://github.com/vmware/go-vcloud-director/tree/master/.changes/v$VERSION) until the release.
27+
Changes in progress for v$VERSION are available at [.changes/v$VERSION](https://github.com/vmware/go-vcloud-director/tree/main/.changes/v$VERSION) until the release.
2828
```
2929

3030
Run `.changes/init.sh version` to get the needed text

.changes/init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ echo ""
2121
echo ""
2222
echo "## $VERSION (Unreleased)"
2323
echo ""
24-
echo "Changes in progress for v$VERSION are available at [.changes/v$VERSION](https://github.com/vmware/go-vcloud-director/tree/master/.changes/v$VERSION) until the release."
24+
echo "Changes in progress for v$VERSION are available at [.changes/v$VERSION](https://github.com/vmware/go-vcloud-director/tree/main/.changes/v$VERSION) until the release."
2525
echo ""
2626

.drone.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ publish:
1919
server: https://coverage.vmware.run
2020
token: $$COVERAGE_TOKEN
2121
when:
22-
branch: master
22+
branch: main

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 2.15.0 (TBC)
22

3-
Changes in progress for v2.15.0 are available at [.changes/v2.15.0](https://github.com/vmware/go-vcloud-director/tree/master/.changes/v2.15.0) until the release.
3+
Changes in progress for v2.15.0 are available at [.changes/v2.15.0](https://github.com/vmware/go-vcloud-director/tree/main/.changes/v2.15.0) until the release.
44

55
## 2.14.0 (January 7, 2022)
66

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ an issue or PR.
3030

3131
**Attribution**
3232

33-
This Code of Conduct is adapted from the VMware Clarity project, available at this page: https://github.com/vmware/clarity/blob/master/CODE_OF_CONDUCT.md
33+
This Code of Conduct is adapted from the VMware Clarity project, available at this page: https://github.com/vmware/clarity/blob/next/docs/CODE_OF_CONDUCT.md

CODING_GUIDELINES.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (client *Client) ExecuteRequestWithCustomError(pathURL, requestType, conten
115115
In addition to saving code and time by reducing the boilerplate, these functions also trigger debugging calls that make the code
116116
easier to monitor.
117117
Using any of the above calls will result in the standard log i
118-
(See [LOGGING.md](https://github.com/vmware/go-vcloud-director/blob/master/util/LOGGING.md)) recording all the requests and responses
118+
(See [LOGGING.md](https://github.com/vmware/go-vcloud-director/blob/main/util/LOGGING.md)) recording all the requests and responses
119119
on demand, and also triggering debug output for specific calls (see `enableDebugShowRequest` and `enableDebugShowResponse`
120120
and the corresponding `disable*` in `api.go`).
121121

@@ -479,4 +479,4 @@ When the tenant context is not needed (system administration calls), we just pas
479479

480480
## Testing
481481

482-
Every feature in the library must include testing. See [TESTING.md](https://github.com/vmware/go-vcloud-director/blob/master/TESTING.md) for more info.
482+
Every feature in the library must include testing. See [TESTING.md](https://github.com/vmware/go-vcloud-director/blob/main/TESTING.md) for more info.

CONTRIBUTING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ contributors. Typical contribution flow steps are:
3131
- Update Go modules files `go.mod` and `go.sum` if you're changing dependencies.
3232
- Fetch changes from upstream and resolve any merge conflicts so that your topic branch is up-to-date
3333
- Push all commits to the topic branch in your forked repo
34-
- Submit a pull request to merge topic branch commits to upstream master
34+
- Submit a pull request to merge topic branch commits to upstream main
3535

3636
If this process sounds unfamiliar have a look at the
3737
excellent [overview of collaboration via pull requests on
@@ -102,11 +102,11 @@ the fork up to date. More on that shortly.
102102

103103
### Make Changes and Commit
104104

105-
Start a new topic branch from the current HEAD position on master and
105+
Start a new topic branch from the current HEAD position on main and
106106
commit your feature changes into that branch.
107107

108108
``` shell
109-
git checkout -b foo-api-fix-22 master
109+
git checkout -b foo-api-fix-22 main
110110
# (Make feature changes)
111111
git commit -a --signoff
112112
git push origin foo-api-fix-22
@@ -131,7 +131,7 @@ them now](https://stackoverflow.com/questions/161813/how-to-resolve-merge-confli
131131
``` shell
132132
git checkout foo-api-fix-22
133133
git fetch -a
134-
git pull --rebase upstream master --tags
134+
git pull --rebase upstream main --tags
135135
git push --force-with-lease origin foo-api-fix-22
136136
```
137137

@@ -159,7 +159,7 @@ To contribute your feature, create a pull request by going to the [go-vcloud-dir
159159

160160
Select 'compare across forks' and select imahacker/go-vcloud-director as 'head fork'
161161
and foo-api-fix-22 as the 'compare' branch. Leave the base fork as
162-
vmware/go-vcloud-director and master.
162+
vmware/go-vcloud-director and main.
163163

164164
### Wait...
165165

@@ -193,7 +193,7 @@ If you need to squash changes into an earlier commit, you can use:
193193
``` shell
194194
git add .
195195
git commit --fixup <commit>
196-
git rebase -i --autosquash master
196+
git rebase -i --autosquash main
197197
git push --force-with-lease origin foo-api-fix-22
198198
```
199199

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# go-vcloud-director [![Build Status](https://travis-ci.org/vmware/go-vcloud-director.svg?branch=master)](https://travis-ci.org/vmware/go-vcloud-director) [![Coverage Status](https://coveralls.io/repos/vmware/go-vcloud-director/badge.svg?branch=master&service=github)](https://coveralls.io/github/vmware/go-vcloud-director?branch=master) [![GoDoc](https://godoc.org/github.com/vmware/go-vcloud-director?status.svg)](http://godoc.org/github.com/vmware/go-vcloud-director) [![Chat](https://img.shields.io/badge/chat-on%20slack-brightgreen.svg)](https://vmwarecode.slack.com/messages/CBBBXVB16)
1+
# go-vcloud-director [![GoDoc](https://godoc.org/github.com/vmware/go-vcloud-director?status.svg)](http://godoc.org/github.com/vmware/go-vcloud-director) [![Chat](https://img.shields.io/badge/chat-on%20slack-brightgreen.svg)](https://vmwarecode.slack.com/messages/CBBBXVB16)
22

33
This repo contains the `go-vcloud-director` package which implements
44
an SDK for vCloud Director. The project serves the needs of Golang
@@ -37,7 +37,7 @@ To show the SDK in action run the example:
3737
```
3838
mkdir ~/govcd_example
3939
go mod init govcd_example
40-
go get github.com/vmware/go-vcloud-director/v2@master
40+
go get github.com/vmware/go-vcloud-director/v2@main
4141
go build -o example
4242
./example user_name "password" org_name vcd_IP vdc_name
4343
```

govcd/edgegateway.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ func (egw *EdgeGateway) UpdateLBGeneralParams(enabled, accelerationEnabled, logg
11741174
}
11751175

11761176
// GetFirewallConfig retrieves firewall configuration and can be used
1177-
// to alter master configuration options. These are 3 fields only:
1177+
// to alter main configuration options. These are 3 fields only:
11781178
// FirewallConfigWithXml.Enabled, FirewallConfigWithXml.DefaultPolicy.LoggingEnabled and
11791179
// FirewallConfigWithXml.DefaultPolicy.Action
11801180
func (egw *EdgeGateway) GetFirewallConfig() (*types.FirewallConfigWithXml, error) {

govcd/sample_govcd_test_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ ova:
179179
ovfPath: ../test-resources/test_vapp_template_ovf/descriptor.ovf
180180
#
181181
# The OVF URL for uploading catalog item for tests.
182-
ovfUrl: https://raw.githubusercontent.com/vmware/go-vcloud-director/master/test-resources/test_vapp_template_ovf/descriptor.ovf
182+
ovfUrl: https://raw.githubusercontent.com/vmware/go-vcloud-director/main/test-resources/test_vapp_template_ovf/descriptor.ovf
183183
media:
184184
# The iso for uploading media item for tests.
185185
# Default paths are simple iso provided by project

0 commit comments

Comments
 (0)