Skip to content

Commit d02af3b

Browse files
author
David Swan
committed
(IAC-1011) - Removal of inappropriate terminology
The removal of any inappropriate or offensive terminology from the codebase
1 parent dfef38e commit d02af3b

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v1
2121
- name: Litmus Parallel
22-
uses: puppetlabs/action-litmus_parallel@master
22+
uses: puppetlabs/action-litmus_parallel@main
2323
with:
2424
platform: ${{ matrix.platform }}
2525
agent_family: ${{ matrix.agent_family }}
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v1
3838
- name: Litmus Parallel
39-
uses: puppetlabs/action-litmus_parallel@master
39+
uses: puppetlabs/action-litmus_parallel@main
4040
with:
4141
platform: ${{ matrix.platform }}
4242
agent_family: ${{ matrix.agent_family }}
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v1
5656
- name: Litmus Parallel
57-
uses: puppetlabs/action-litmus_parallel@master
57+
uses: puppetlabs/action-litmus_parallel@main
5858
with:
5959
platform: ${{ matrix.platform }}
6060
agent_family: ${{ matrix.agent_family }}
@@ -75,7 +75,7 @@ jobs:
7575
steps:
7676
- uses: actions/checkout@v1
7777
- name: Spec Tests
78-
uses: puppetlabs/action-litmus_spec@master
78+
uses: puppetlabs/action-litmus_spec@main
7979
with:
8080
puppet_gem_version: ${{ matrix.puppet_gem_version }}
8181
check: ${{ matrix.check }}

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ All notable changes to this project will be documented in this file. The format
6868

6969
### Changed
7070

71-
- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/master/LICENSE))
71+
- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/main/LICENSE))
7272

7373
### Fixed
7474

@@ -95,8 +95,8 @@ All notable changes to this project will be documented in this file. The format
9595

9696
- Fix problem installing sql instance when an array of SQL Admins are specified. ([MODULES-6356](https://tickets.puppetlabs.com/browse/MODULES-6356))
9797
- Fix AppVeyor OpenSSL bug.([Modsync commit with discussion](https://github.com/puppetlabs/modulesync_configs/commit/f04d0d1119cb5cbd4c3aac76047c4c766ae1fcb2))
98-
- During acceptance testing, only execute master provisioning steps if there is
99-
a master in the hosts array.
98+
- During acceptance testing, only execute server provisioning steps if there is
99+
a server in the hosts array.
100100
- Stop running `gem update bundler` during Travis runs. ([MODULES-6339](https://tickets.puppetlabs.com/browse/MODULES-6339))
101101
- The `sqlserver_tsql` resource now returns errors from sql queries properly. ([MODULES-6281](https://tickets.puppetlabs.com/browse/MODULES-6281))
102102

@@ -263,7 +263,7 @@ attempts to reinstall an instance that already exists ([MODULES-6022](https://ti
263263

264264
Initial release.
265265

266-
[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..master
266+
[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..main
267267
[2.5.1]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.5.0..v2.5.1
268268
[2.5.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.4.0..2.5.0
269269
[2.4.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.3.0..2.4.0

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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
### Changed
4141

42-
- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/master/LICENSE))
42+
- License terms updated to allow a Bolt trial period ([License](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/main/LICENSE))
4343

4444
### Fixed
4545

@@ -66,8 +66,8 @@
6666

6767
- Fix problem installing sql instance when an array of SQL Admins are specified. ([MODULES-6356](https://tickets.puppetlabs.com/browse/MODULES-6356))
6868
- Fix AppVeyor OpenSSL bug.([Modsync commit with discussion](https://github.com/puppetlabs/modulesync_configs/commit/f04d0d1119cb5cbd4c3aac76047c4c766ae1fcb2))
69-
- During acceptance testing, only execute master provisioning steps if there is
70-
a master in the hosts array.
69+
- During acceptance testing, only execute server provisioning steps if there is
70+
a server in the hosts array.
7171
- Stop running `gem update bundler` during Travis runs. ([MODULES-6339](https://tickets.puppetlabs.com/browse/MODULES-6339))
7272
- The `sqlserver_tsql` resource now returns errors from sql queries properly. ([MODULES-6281](https://tickets.puppetlabs.com/browse/MODULES-6281))
7373

@@ -234,7 +234,7 @@ attempts to reinstall an instance that already exists ([MODULES-6022](https://ti
234234

235235
Initial release.
236236

237-
[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..master
237+
[Unreleased]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v2.5.1..main
238238
[2.5.1]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.5.0..v2.5.1
239239
[2.5.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.4.0..2.5.0
240240
[2.4.0]: https://github.com/puppetlabs/puppetlabs-sqlserver/compare/2.3.0..2.4.0

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
This Module is only available for use with (1) the Puppet Enterprise Free License for up to 10 Nodes or as part of a Puppet Enterprise paid license, both subject to the Master License Agreement located at https://puppet.com/legal or other existing valid license agreement between user and Puppet ("Agreement") governing the use of Puppet Enterprise or (2) Puppet Bolt for up to a ninety (90) day period from the date this Module is downloaded, subject to the open source license for Puppet Bolt. With the exception of Puppet Bolt, this Module is not available for users of any other open source Puppet software. Any terms not defined herein shall have the meaning set forth in the Agreement.
1+
This Module is only available for use with (1) the Puppet Enterprise Free License for up to 10 Nodes or as part of a Puppet Enterprise paid license, both subject to the Software License Agreement located at https://puppet.com/legal or other existing valid license agreement between user and Puppet ("Agreement") governing the use of Puppet Enterprise or (2) Puppet Bolt for up to a ninety (90) day period from the date this Module is downloaded, subject to the open source license for Puppet Bolt. With the exception of Puppet Bolt, this Module is not available for users of any other open source Puppet software. Any terms not defined herein shall have the meaning set forth in the Agreement.
22

33
By downloading this Module, you represent that you have agreed to a valid Agreement for Puppet Enterprise or the applicable open source license for Puppet Bolt and you further agree that your use of the Module is governed by the terms of such Agreement and license, respectively.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ sqlserver::role { 'sysadmin':
268268

269269
## Reference
270270

271-
For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/master/REFERENCE.md)
271+
For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-sqlserver/blob/main/REFERENCE.md)
272272

273273
## Limitations
274274

0 commit comments

Comments
 (0)