tree 44511d788055cc2dbc59652106a0435fc5f0bf56
parent 5a8fed408f57d1484c947420e4610c49fe0467ba
parent bcec5eb7e247dc983184b37a3dbb4143afd19ac8
author Jihoon Son <jihoonson@apache.org> 1437709136 +0900
committer Jihoon Son <jihoonson@apache.org> 1437709136 +0900

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

Conflicts:
	CHANGES