Merge branches 'ignite-158' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-158
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7cba60fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7cba60fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7cba60fe Branch: refs/heads/ignite-6 Commit: 7cba60fec715dc2e97d98c394034c3ab8b274aed Parents: c34d24e 64addf7 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Feb 3 16:11:38 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Feb 3 16:11:38 2015 +0300 ---------------------------------------------------------------------- modules/geospatial/licenses/apache-2.0.txt | 202 ++++++++++++ .../geospatial/licenses/jts-lgpl-license.txt | 165 ++++++++++ modules/geospatial/pom.xml | 59 ++++ modules/geospatial/readme.txt | 33 ++ .../query/h2/opt/GridH2SpatialIndex.java | 326 +++++++++++++++++++ .../query/h2/GridH2IndexingGeoSelfTest.java | 248 ++++++++++++++ .../testsuites/GeoSpatialIndexingTestSuite.java | 39 +++ modules/indexing/licenses/jts-lgpl-license.txt | 165 ---------- modules/indexing/pom.xml | 6 - .../processors/query/h2/IgniteH2Indexing.java | 38 ++- .../query/h2/opt/GridH2SpatialIndex.java | 326 ------------------- .../query/h2/GridH2IndexingGeoSelfTest.java | 248 -------------- .../IgniteH2IndexingSpiTestSuite.java | 3 - pom.xml | 1 + 14 files changed, 1110 insertions(+), 749 deletions(-) ----------------------------------------------------------------------
