Merge branch 'master' into feature/initcontainer_sidecar_toggle

This commit is contained in:
Felix Kunde
2019-12-02 16:01:11 +01:00
4 changed files with 28 additions and 0 deletions
@@ -302,3 +302,7 @@ spec:
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
scalyr_server_url:
type: string
status:
type: object
additionalProperties:
type: string