Merge github.com:grpc/grpc into async-api-new

1 files changed, 10 insertions, 10 deletions

diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 1827e36c55..1cd890ce95 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -99,23 +99,23 @@
   }, 
   {
     "language": "c", 
-    "name": "gpr_histogram_test"
+    "name": "gpr_env_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_host_port_test"
+    "name": "gpr_file_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_log_test"
+    "name": "gpr_histogram_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_file_test"
+    "name": "gpr_host_port_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_env_test"
+    "name": "gpr_log_test"
   }, 
   {
     "language": "c", 
@@ -279,23 +279,23 @@
   }, 
   {
     "language": "c++", 
-    "name": "tips_publisher_test"
+    "name": "status_test"
   }, 
   {
     "language": "c++", 
-    "name": "tips_subscriber_test"
+    "name": "sync_client_async_server_test"
   }, 
   {
     "language": "c++", 
-    "name": "status_test"
+    "name": "thread_pool_test"
   }, 
   {
     "language": "c++", 
-    "name": "sync_client_async_server_test"
+    "name": "tips_publisher_test"
   }, 
   {
     "language": "c++", 
-    "name": "thread_pool_test"
+    "name": "tips_subscriber_test"
   }, 
   {
     "language": "c",