You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2015/12/14 20:30:39 UTC
[2/2] hive git commit: Merge remote-tracking branch 'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/69f03b86
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/69f03b86
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/69f03b86
Branch: refs/heads/master
Commit: 69f03b86c4ded478bff11f8bf163c8012b08c614
Parents: 02d2972 55dc008
Author: Alan Gates <ga...@hortonworks.com>
Authored: Mon Dec 14 11:24:05 2015 -0800
Committer: Alan Gates <ga...@hortonworks.com>
Committed: Mon Dec 14 11:24:05 2015 -0800
----------------------------------------------------------------------
.../metrics/metrics2/CodahaleMetrics.java | 7 ++
.../org/apache/hadoop/hive/conf/HiveConf.java | 2 +
.../hive/common/metrics/MetricsTestUtils.java | 9 +-
.../hive/metastore/TestMetaStoreMetrics.java | 113 +++++--------------
.../hbase/TestHBaseMetastoreMetrics.java | 32 ++----
.../hive/jdbc/miniHS2/TestHs2Metrics.java | 42 ++++---
.../hadoop/hive/metastore/HiveMetaStore.java | 2 +-
.../TestHiveMetaStorePartitionSpecs.java | 2 +-
ql/pom.xml | 7 ++
.../zookeeper/TestZookeeperLockManager.java | 29 ++---
service/pom.xml | 14 +--
.../cli/session/TestSessionManagerMetrics.java | 23 ++--
12 files changed, 109 insertions(+), 173 deletions(-)
----------------------------------------------------------------------