Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f895e5d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f895e5d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f895e5d Branch: refs/heads/ignite-843 Commit: 5f895e5d17b2b20ead5d8101dcbc7e0e27523915 Parents: ebe6a9e 3ba8145 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Aug 26 17:38:53 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Aug 26 17:38:53 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/routes/agent.js | 15 ++ .../cache/query/GridCacheQueryManager.java | 22 +-- .../cache/query/GridCacheSqlIndexMetadata.java | 8 +- .../cache/query/GridCacheSqlMetadata.java | 16 +-- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 10 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 14 +- .../http/jetty/GridJettyJsonConfig.java | 142 +++++++++++++++---- 7 files changed, 168 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
