Merge branch 'master' into feature/1.15-client

googleforgames · May 8, 2020 · 7079ea4 · 7079ea4
2 parents 3fccc2f + 174f49e
commit 7079ea4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/apis/agones/v1/gameserver_test.go b/pkg/apis/agones/v1/gameserver_test.go
@@ -1196,7 +1196,7 @@ func TestGameServerPodNoErrors(t *testing.T) {
 	assert.True(t, metav1.IsControlledBy(pod, fixture))
 }
 
-func TestGameServerPod_ContainerNotFound_ErrReturned(t *testing.T) {
+func TestGameServerPodContainerNotFoundErrReturned(t *testing.T) {
 	t.Parallel()
 	runtime.FeatureTestMutex.Lock()
 	defer runtime.FeatureTestMutex.Unlock()
@@ -1253,7 +1253,7 @@ func TestGameServerPod_ContainerNotFound_ErrReturned(t *testing.T) {
 
 }
 
-func TestGameServerPod_WithSidecar_NoErrros(t *testing.T) {
+func TestGameServerPodWithSidecarNoErrors(t *testing.T) {
 	t.Parallel()
 	fixture := defaultGameServer()
 	fixture.ApplyDefaults()

diff --git a/site/content/en/docs/Advanced/limiting-resources.md b/site/content/en/docs/Advanced/limiting-resources.md
@@ -44,7 +44,7 @@ spec:
             cpu: "250m" #this is our limit here
 ```
 
-If you do not set a limit or request, the default is set my Kubernetes at a 100m CPU request. 
+If you do not set a limit or request, the default is set by Kubernetes at a 100m CPU request. 
 
 ## SDK GameServer sidecar