tree 833846ff8f0bd3e6e2034b78aa74ca025404ed0b
parent 0073ef23a3873bbe20534f6a2a0c75a5dcbda167
parent ab2efce8fb4015523a9a818f0e03fa57c6366585
author HyoungJun Kim <babokim@babokim-MacBook-Pro.local> 1417767619 +0900
committer HyoungJun Kim <babokim@babokim-MacBook-Pro.local> 1417767619 +0900

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into hbase_storage

Conflicts:
	tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java