Merge branch 'client_channel_connectivity_api' into xds_client

grpc · Oct 1, 2019 · f3ae053 · f3ae053
2 parents 32c5bbb + a70c338
commit f3ae053
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/php/README.md b/src/php/README.md
@@ -43,7 +43,6 @@ $ sudo yum install php56w php56w-devel php-pear phpunit gcc zlib-devel
 
 **Install PHP and PECL on Mac:**
 ```sh
-$ brew install homebrew/php/php56-grpc
 $ curl -O http://pear.php.net/go-pear.phar
 $ sudo php -d detect_unicode=0 go-pear.phar
 ```

diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
@@ -101,6 +101,7 @@ def __init__(self, patch=[], runtimes=[], testcases_file=None):
         ('v1.22.0', ReleaseInfo()),
         ('v1.22.1', ReleaseInfo()),
         ('v1.23.0', ReleaseInfo()),
+        ('v1.24.0', ReleaseInfo()),
     ]),
     'go':
     OrderedDict(
@@ -218,6 +219,7 @@ def __init__(self, patch=[], runtimes=[], testcases_file=None):
         ('v1.22.0', ReleaseInfo()),
         ('v1.22.1', ReleaseInfo()),
         ('v1.23.0', ReleaseInfo()),
+        ('v1.24.0', ReleaseInfo()),
     ]),
     'node':
     OrderedDict([
@@ -270,6 +272,7 @@ def __init__(self, patch=[], runtimes=[], testcases_file=None):
         ('v1.22.0', ReleaseInfo()),
         ('v1.22.1', ReleaseInfo()),
         ('v1.23.0', ReleaseInfo()),
+        ('v1.24.0', ReleaseInfo()),
         # TODO: https://github.com/grpc/grpc/issues/18262.
         # If you are not encountering the error in above issue
         # go ahead and upload the docker image for new releases.
@@ -300,6 +303,7 @@ def __init__(self, patch=[], runtimes=[], testcases_file=None):
         ('v1.22.0', ReleaseInfo()),
         ('v1.22.1', ReleaseInfo()),
         ('v1.23.0', ReleaseInfo()),
+        ('v1.24.0', ReleaseInfo()),
     ]),
     'csharp':
     OrderedDict([
@@ -333,5 +337,6 @@ def __init__(self, patch=[], runtimes=[], testcases_file=None):
         ('v1.22.0', ReleaseInfo()),
         ('v1.22.1', ReleaseInfo()),
         ('v1.23.0', ReleaseInfo()),
+        ('v1.24.0', ReleaseInfo()),
     ]),
 }