Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-838_2
Merge branch 'TAJO-838_2' of github.com:jihoonson/tajo-2 into TAJO-838_2
TAJO-838_2