tree 0a33091fe9d3f217588496515ec3987d7a67389c
parent 6771d20e847e7edf8754fe3b2652725cd09e2313
parent b9a39728f9a18f8a9f986f35a40c17005795257b
author Hyunsik Choi <hyunsik@apache.org> 1404878998 +0900
committer Hyunsik Choi <hyunsik@apache.org> 1404878998 +0900

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

Conflicts:
	tajo-core/src/main/java/org/apache/tajo/engine/parser/HiveQLAnalyzer.java