Merge branch 'master' into new-timeout

kdima · Sep 15, 2020 · 464d177 · 464d177
2 parents 0263053 + f31221c
commit 464d177
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -259,6 +259,7 @@ steps:
   args: [ "-j", "5", "--output-sync=target", "run-sdk-conformance-tests"]
   waitFor:
     - build-images
+    - tests
 
 #
 # Cache the CPP conformance build directory, to speed up subsequent builds (considerably)

diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
diff --git a/site/content/en/docs/Guides/Client SDKs/rest.md b/site/content/en/docs/Guides/Client SDKs/rest.md
@@ -262,9 +262,8 @@ Response:
 
 #### Alpha: GetPlayerCount
 
-This function returns if the playerID is currently connected to the GameServer. 
-This is always accurate from what has been set through this SDK,
-even if the value has yet to be updated on the GameServer status resource.
+This function retrieves the current player count. 
+This is always accurate from what has been set through this SDK, even if the value has yet to be updated on the GameServer status resource.
 
 ```bash
 $ curl -H "Content-Type: application/json" -X GET http://localhost:${AGONES_SDK_HTTP_PORT}/alpha/player/count