Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-341
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ade0859 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ade0859 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ade0859 Branch: refs/heads/ignite-494b Commit: 0ade085952f1e9ff1ae7b161bd8c191e438b9353 Parents: d88992f b7fa7a6 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Mar 25 15:14:50 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Mar 25 15:14:50 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteComponentType.java | 7 +++++++ .../processors/query/GridQueryProcessor.java | 15 +++++++++++++++ 2 files changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ade0859/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ----------------------------------------------------------------------