Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into
index_support
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/8effa335
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/8effa335
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/8effa335
Branch: refs/heads/index_support
Commit: 8effa3355117320faee98e6436cb12d0d9953d57
Parents: 806469a fec5961
Author: Jihoon Son <[email protected]>
Authored: Thu Jul 2 15:32:31 2015 +0900
Committer: Jihoon Son <[email protected]>
Committed: Thu Jul 2 15:32:31 2015 +0900
----------------------------------------------------------------------
CHANGES | 4 ++++
.../tajo/ws/rs/resources/TablesResource.java | 19 +++++++----------
.../ws/rs/resources/TestTablesResource.java | 22 +++++++++++---------
3 files changed, 23 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/8effa335/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 746ed92,63499b5..7bea70c
--- a/CHANGES
+++ b/CHANGES
@@@ -166,10 -166,10 +166,14 @@@ Release 0.11.0 - unrelease
BUG FIXES
+ TAJO-1608: Fix test failure in index_support branch. (jihoon)
+
+ TAJO-1594: Catalog schema is invalid for some databases. (jihoon)
+
+ TAJO-1657: Tajo Rest API /database/{database-name]/tables should return
table
+ names only without invalid external table info.
+ (Contributed by DaeMyung Kang, Committed by jihoon)
+
TAJO-1644: When inserting empty data into a partitioned table,
existing data would be removed. (jaehwa)
