Merge pull request #390 from aledbf/fix-rps-comment

Fix RateLimit comment
kubernetes · Mar 7, 2017 · d2e5c43 · d2e5c43
2 parents 251990d + 91904de
commit d2e5c43
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/pkg/ingress/annotations/ratelimit/main.go b/core/pkg/ingress/annotations/ratelimit/main.go
@@ -36,10 +36,10 @@ const (
 	defSharedSize = 5
 )
 
-// RateLimit returns rate limit configuration for an Ingress rule
-// Is possible to limit the number of connections per IP address or
-// connections per second.
-// Note: Is possible to specify both limits
+// RateLimit returns rate limit configuration for an Ingress rule limiting the
+// number of connections per IP address and/or connections per second.
+// If you both annotations are specified in a single Ingress rule, RPS limits
+// takes precedence
 type RateLimit struct {
 	// Connections indicates a limit with the number of connections per IP address
 	Connections Zone `json:"connections"`