| commit | 1bf1536db45b50f80872fe01ac8f1b4a2400f0d2 | [log] [tgz] |
|---|---|---|
| author | Jihoon Son <jihoonson@apache.org> | Fri Jul 24 12:38:56 2015 +0900 |
| committer | Jihoon Son <jihoonson@apache.org> | Fri Jul 24 12:38:56 2015 +0900 |
| tree | 44511d788055cc2dbc59652106a0435fc5f0bf56 | |
| parent | 5a8fed408f57d1484c947420e4610c49fe0467ba [diff] | |
| parent | bcec5eb7e247dc983184b37a3dbb4143afd19ac8 [diff] |
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support Conflicts: CHANGES