You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2017/05/02 18:49:29 UTC
hadoop git commit: HADOOP-14281. Fix TestKafkaMetrics#testPutMetrics.
Contributed by Alison Yu.
Repository: hadoop
Updated Branches:
refs/heads/trunk dcc292d7d -> b062b323b
HADOOP-14281. Fix TestKafkaMetrics#testPutMetrics. Contributed by Alison Yu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b062b323
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b062b323
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b062b323
Branch: refs/heads/trunk
Commit: b062b323b7f48343c379520f5380e1a63dbcc7a4
Parents: dcc292d
Author: Andrew Wang <wa...@apache.org>
Authored: Tue May 2 11:49:19 2017 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue May 2 11:49:19 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b062b323/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java b/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java
index 8479298..bee6aaa 100644
--- a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java
+++ b/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java
@@ -155,7 +155,7 @@ public class TestKafkaMetrics {
Date currDate = new Date(timestamp);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String date = dateFormat.format(currDate);
- SimpleDateFormat timeFormat = new SimpleDateFormat("hh:mm:ss");
+ SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
String time = timeFormat.format(currDate);
String hostname = new String("null");
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org