Merge branch 'ci8915'
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f895b277 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f895b277 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f895b277 Branch: refs/heads/master Commit: f895b277399fc37cdcd349a321ddf12c49756a5c Parents: 1988615 c40c6de Author: Alan Gates <ga...@hortonworks.com> Authored: Tue May 5 09:12:15 2015 -0700 Committer: Alan Gates <ga...@hortonworks.com> Committed: Tue May 5 09:12:15 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hive/ql/txn/compactor/Cleaner.java | 18 ++++++++---- .../hadoop/hive/ql/txn/compactor/Worker.java | 30 ++++++++++++++------ 2 files changed, 33 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
