Merge branches 'ignite-143' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-futures-cleanup-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/c3b1493d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3b1493d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3b1493d Branch: refs/heads/ignite-47 Commit: c3b1493da73ad7bc5232f7918188d0ad38302c0b Parents: 04a317b b0dada0 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Mar 5 14:54:57 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Mar 5 14:54:57 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../processors/cache/GridCacheAdapter.java | 11 +++- .../parser/dialect/OracleMetadataDialect.java | 66 +++++++++++++------- .../org/apache/ignite/schema/ui/MessageBox.java | 7 +++ 4 files changed, 63 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3b1493d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
