Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b23ea747 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b23ea747 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b23ea747 Branch: refs/heads/ignite-980 Commit: b23ea747d9cf351f607d60f520781f5d46e98715 Parents: 08d134d c1eee18 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Jun 18 13:47:19 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Jun 18 13:47:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 5 +++++ .../ignite/internal/processors/query/GridQueryProcessor.java | 7 +++++++ 2 files changed, 12 insertions(+) ----------------------------------------------------------------------
