Merge pull request #68 from ewiseblatt/fix_comment

Eric Wiseblatt · web-flow · commit d69a0fc7061e · 2016-11-18T14:05:57.000-05:00
Fixed comment breaking travis
diff --git a/kork-stackdriver/src/main/java/com/netflix/spectator/stackdriver/MetricDescriptorCache.java b/kork-stackdriver/src/main/java/com/netflix/spectator/stackdriver/MetricDescriptorCache.java
@@ -172,8 +172,8 @@ public String meterToKind(Registry registry, Meter meter) {
   /**
    * Get the labels to use for a given metric instance.
    *
-   * @param descriptor
-   *   The Stackdriver MetricDescriptor for the labels.
+   * @param descriptorType
+   *   The Stackdriver custom descriptor ype name for the labels.
    *
    * @param tags
    *   The Spectator Measurement tags for the data.

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,8 @@ public String meterToKind(Registry registry, Meter meter) {`
`172`	`172`	`/**`
`173`	`173`	`* Get the labels to use for a given metric instance.`
`174`	`174`	`*`
`175`		`- * @param descriptor`
`176`		`- * The Stackdriver MetricDescriptor for the labels.`
	`175`	`+ * @param descriptorType`
	`176`	`+ * The Stackdriver custom descriptor ype name for the labels.`
`177`	`177`	`*`
`178`	`178`	`* @param tags`
`179`	`179`	`* The Spectator Measurement tags for the data.`