Merge remote-tracking branch 'origin/ignite-32' into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11c2ecfc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11c2ecfc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11c2ecfc Branch: refs/heads/ignite-160 Commit: 11c2ecfc495ed56e6efb200b2ed85bc4baf363aa Parents: 7e33985 666ad8b Author: anovikov <anovi...@gridgain.com> Authored: Wed Feb 4 14:36:16 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Wed Feb 4 14:36:16 2015 +0700 ---------------------------------------------------------------------- .../src/test/resources/spring-server-node.xml | 6 +- .../test/resources/spring-server-ssl-node.xml | 6 +- .../java/org/apache/ignite/IgnitePortables.java | 4 +- .../cache/query/CacheQueryConfiguration.java | 23 --- .../cache/query/CacheQueryTypeMetadata.java | 206 ------------------- .../ignite/cache/store/jdbc/JdbcCacheStore.java | 31 +-- .../processors/query/GridQueryProcessor.java | 36 ++-- 7 files changed, 43 insertions(+), 269 deletions(-) ----------------------------------------------------------------------
