Skip to content

Commit e2c2671

Browse files
author
David Swan
committed
(IAC1001) - Removal of inappropriate terminology
Removal of any inappropriate or offensive terminology from the codebase.
1 parent 445bebf commit e2c2671

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ BEFORE YOU CREATE A PULL REQUEST:
33
44
Ensure you have read over
55
6-
CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-powershell/blob/master/CONTRIBUTING.md
6+
CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-powershell/blob/main/CONTRIBUTING.md
77
88
We provide defined guidance (as such, we strongly adhere to it).
99
1010
A summary of our expectations:
1111
- A ticket was created at https://tickets.puppetlabs.com/secure/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&components=12015&summary=%5BPOWERSHELL%5D%20, or you have an existing ticket #
12-
- You are not submitting a pull request from your MASTER branch.
12+
- You are not submitting a pull request from your MAIN branch.
1313
- The first line of your git commit message has the ticket # and a short summary of the fix, followed by a detailed explanation of the fix in the git commit body.
1414
- Your git commit message format is important. We have a very defined expectation for this format and are keep to it. Really, READ the entire Contributing document. It will save you and us time.
1515
- Do not reformat code, it makes it hard to see what has changed. Leave the formatting to us.

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v1
2020
- name: Litmus Parallel
21-
uses: puppetlabs/action-litmus_parallel@master
21+
uses: puppetlabs/action-litmus_parallel@main
2222
with:
2323
platform: ${{ matrix.platform }}
2424
agent_family: ${{ matrix.agent_family }}
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
- uses: actions/checkout@v1
3939
- name: Spec Tests
40-
uses: puppetlabs/action-litmus_spec@master
40+
uses: puppetlabs/action-litmus_spec@main
4141
with:
4242
puppet_gem_version: ${{ matrix.puppet_gem_version }}
4343
check: ${{ matrix.check }}

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ All notable changes to this project will be documented in this file. The format
218218

219219
- Fixed issue with metadata and PE version requirement
220220

221-
[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...master
221+
[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...main
222222
[2.3.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.2.0...2.3.0
223223
[2.2.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.5...2.2.0
224224
[2.1.5]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.4...2.1.5

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ process as easy as possible.
108108

109109
To submit your changes via a GitHub pull request, we _highly_
110110
recommend that you have them on a topic branch, instead of
111-
directly on "master".
111+
directly on "main".
112112
It makes things much easier to keep track of, especially if
113113
you decide to work on another thing before your first change
114114
is merged in.

HISTORY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177

178178
- Fixed issue with metadata and PE version requirement
179179

180-
[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...master
180+
[Unreleased]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.3.0...main
181181
[2.3.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.2.0...2.3.0
182182
[2.2.0]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.5...2.2.0
183183
[2.1.5]: https://github.com/puppetlabs/puppetlabs-powershell/compare/2.1.4...2.1.5

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@
8181
}
8282
],
8383
"pdk-version": "1.18.1",
84-
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
85-
"template-ref": "heads/master-0-gd610ead"
84+
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
85+
"template-ref": "heads/main-0-gd610ead"
8686
}

spec/fixtures/scripts/install_pwsh/windows.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
2+
# Replace the below `master` reference when possible
23
Invoke-WebRequest -Uri https://github.com/PowerShell/PowerShell/raw/master/tools/install-powershell.ps1 -UseBasicParsing -OutFile install-pwsh.ps1
34

45
& ./install-pwsh.ps1 -AddToPath

0 commit comments

Comments
 (0)