Merge remote-tracking branch 'origin/ignite-1155_1' into ignite-1155_1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fae0422e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fae0422e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fae0422e Branch: refs/heads/ignite-843 Commit: fae0422e633e93144e017ca72b544add15228c67 Parents: 3bb91df d087161 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Aug 5 00:31:28 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Aug 5 00:31:28 2015 +0700 ---------------------------------------------------------------------- .../ignite/examples/ExampleNodeStartup.java | 4 ++- .../JettyRestProcessorAbstractSelfTest.java | 14 ++++++++ .../cache/query/GridCacheQueryManager.java | 37 ++++++++++++++++---- .../cache/query/GridCacheSqlIndexMetadata.java | 11 ++++-- .../cache/query/GridCacheSqlMetadata.java | 28 ++++++++++++--- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 10 +++--- .../processors/rest/GridRestCommand.java | 3 ++ .../processors/rest/GridRestProcessor.java | 5 +-- .../handlers/cache/GridCacheCommandHandler.java | 14 +++++++- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 14 ++++---- modules/nodejs/src/main/js/cache.js | 9 +++++ .../http/jetty/GridJettyRestHandler.java | 1 + 12 files changed, 121 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
