diff options
| author | k8s-ci-robot <k8s-ci-robot@users.noreply.github.com> | 2018-04-06 07:17:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 07:17:08 -0700 |
| commit | aaeae6669a215c9d160fe3ccfe64fbf65bdb62db (patch) | |
| tree | 9c4381184a5dd4b723b5af6d07742a446c8ef876 /contributors/guide | |
| parent | 1791183e5d7f409f91bcf648ab5683490d9c7a9b (diff) | |
| parent | 8798cc13a66cf8edad0634638457bcc70364214f (diff) | |
Merge pull request #2009 from patrikerdes/macOS
Change 'Mac OS X' and 'OS X' to 'macOS'
Diffstat (limited to 'contributors/guide')
| -rw-r--r-- | contributors/guide/coding-conventions.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contributors/guide/coding-conventions.md b/contributors/guide/coding-conventions.md index 680080da..6bd597a2 100644 --- a/contributors/guide/coding-conventions.md +++ b/contributors/guide/coding-conventions.md @@ -16,7 +16,7 @@ Updated: 1/24/2018 - https://google.github.io/styleguide/shell.xml - Ensure that build, release, test, and cluster-management scripts run on -OS X +macOS - Go @@ -75,7 +75,7 @@ example, see [TestNamespaceAuthorization](https://git.k8s.io/kubernetes/test/int [end-to-end (test/e2e) tests](/contributors/devel/e2e-tests.md) - Including new kubectl commands and major features of existing commands - - Unit tests must pass on OS X and Windows platforms - if you use Linux + - Unit tests must pass on macOS and Windows platforms - if you use Linux specific features, your test case must either be skipped on windows or compiled out (skipped is better when running Linux specific commands, compiled out is required when your code does not compile on Windows). |