From 56dc653a0b5777396ff30bd5d2d0a5ecaaa8a01e Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 8 Dec 2020 23:53:51 -0800
Subject: [PATCH] rebase master

---
 test/integration/goldens/logging/MetricsClient.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/integration/goldens/logging/MetricsClient.java b/test/integration/goldens/logging/MetricsClient.java
index e3dc961d66..e25005abee 100644
--- a/test/integration/goldens/logging/MetricsClient.java
+++ b/test/integration/goldens/logging/MetricsClient.java
@@ -222,7 +222,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    * }
    * }</pre>
    *
-   * @param metric_name Required. The resource name of the desired metric:
+   * @param metricName Required. The resource name of the desired metric:
    *     <p>"projects/[PROJECT_ID]/metrics/[METRIC_ID]"
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -247,7 +247,7 @@ public final LogMetric getLogMetric(LogMetricName metricName) {
    * }
    * }</pre>
    *
-   * @param metric_name Required. The resource name of the desired metric:
+   * @param metricName Required. The resource name of the desired metric:
    *     <p>"projects/[PROJECT_ID]/metrics/[METRIC_ID]"
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -370,7 +370,7 @@ public final UnaryCallable<CreateLogMetricRequest, LogMetric> createLogMetricCal
    * }
    * }</pre>
    *
-   * @param metric_name Required. The resource name of the metric to update:
+   * @param metricName Required. The resource name of the metric to update:
    *     <p>"projects/[PROJECT_ID]/metrics/[METRIC_ID]"
    *     <p>The updated metric must be provided in the request and it's `name` field must be the
    *     same as `[METRIC_ID]` If the metric does not exist in `[PROJECT_ID]`, then a new metric is
@@ -401,7 +401,7 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri
    * }
    * }</pre>
    *
-   * @param metric_name Required. The resource name of the metric to update:
+   * @param metricName Required. The resource name of the metric to update:
    *     <p>"projects/[PROJECT_ID]/metrics/[METRIC_ID]"
    *     <p>The updated metric must be provided in the request and it's `name` field must be the
    *     same as `[METRIC_ID]` If the metric does not exist in `[PROJECT_ID]`, then a new metric is
@@ -449,7 +449,7 @@ public final UnaryCallable<UpdateLogMetricRequest, LogMetric> updateLogMetricCal
    * }
    * }</pre>
    *
-   * @param metric_name Required. The resource name of the metric to delete:
+   * @param metricName Required. The resource name of the metric to delete:
    *     <p>"projects/[PROJECT_ID]/metrics/[METRIC_ID]"
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -474,7 +474,7 @@ public final void deleteLogMetric(LogMetricName metricName) {
    * }
    * }</pre>
    *
-   * @param metric_name Required. The resource name of the metric to delete:
+   * @param metricName Required. The resource name of the metric to delete:
    *     <p>"projects/[PROJECT_ID]/metrics/[METRIC_ID]"
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */