Return-Path: <commits-return-2252-archive-asf-public=cust-asf.ponee.io@kudu.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id B3F3D200BBA
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sat, 22 Oct 2016 03:40:57 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id B27D5160AF5; Sat, 22 Oct 2016 01:40:57 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 29C8E160AE9
	for <archive-asf-public@cust-asf.ponee.io>; Sat, 22 Oct 2016 03:40:57 +0200 (CEST)
Received: (qmail 37017 invoked by uid 500); 22 Oct 2016 01:40:56 -0000
Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@kudu.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@kudu.apache.org>
List-Post: <mailto:commits@kudu.apache.org>
List-Id: <commits.kudu.apache.org>
Reply-To: dev@kudu.apache.org
Delivered-To: mailing list commits@kudu.apache.org
Received: (qmail 36999 invoked by uid 99); 22 Oct 2016 01:40:56 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Oct 2016 01:40:56 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 1AF41E69A3; Sat, 22 Oct 2016 01:40:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: adar@apache.org
To: commits@kudu.apache.org
Date: Sat, 22 Oct 2016 01:40:56 -0000
Message-Id: <9401a811dd5146499421758b6ff7b2bf@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] kudu git commit: types: Correct printable name of
 UNIXTIME_MICROS
archived-at: Sat, 22 Oct 2016 01:40:57 -0000

Repository: kudu
Updated Branches:
  refs/heads/master 1096d663f -> 4b5425aa3


types: Correct printable name of UNIXTIME_MICROS

UNIXTIME_MICROS is still printing "timestamp" in some errors. This
patch fixes that.

Change-Id: I84b5dc52c3f3ee311330c5151d380b34e13a34ae
Reviewed-on: http://gerrit.cloudera.org:8080/4777
Tested-by: Kudu Jenkins
Reviewed-by: Dinesh Bhat <dinesh@cloudera.com>
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/49d0d7f4
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/49d0d7f4
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/49d0d7f4

Branch: refs/heads/master
Commit: 49d0d7f48897adb7bea3031ab7e13ddb80fe7b14
Parents: 1096d66
Author: Jordan Birdsell <jordantbirdsell@gmail.com>
Authored: Thu Oct 20 18:51:51 2016 -0400
Committer: Todd Lipcon <todd@apache.org>
Committed: Fri Oct 21 17:13:51 2016 +0000

----------------------------------------------------------------------
 src/kudu/common/types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/49d0d7f4/src/kudu/common/types.h
----------------------------------------------------------------------
diff --git a/src/kudu/common/types.h b/src/kudu/common/types.h
index 9bed955..46f0452 100644
--- a/src/kudu/common/types.h
+++ b/src/kudu/common/types.h
@@ -424,7 +424,7 @@ struct DataTypeTraits<UNIXTIME_MICROS> : public DerivedTypeTraits<INT64>{
   static const int US_TO_S = 1000L * 1000L;
 
   static const char* name() {
-    return "timestamp";
+    return "unixtime_micros";
   }
 
   static void AppendDebugStringForValue(const void* val, string* str) {