Merge branches 'ignite-1.3.3' and 'ignite-support804' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-support804
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/015d9cd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/015d9cd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/015d9cd5 Branch: refs/heads/ignite-946 Commit: 015d9cd5397d9d24489cfe757df36192b83ebcfe Parents: 23377fe 12cbe22 Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Aug 3 15:12:10 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Aug 3 15:12:10 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 17 +------- .../processors/cache/GridCacheProcessor.java | 10 ++++- .../processors/cache/GridCacheUtils.java | 1 - .../ignite/internal/util/IgniteUtils.java | 16 ++++++++ .../parser/dialect/OracleMetadataDialect.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 ++++++++++++++++++++ .../ignite/internal/GridFactorySelfTest.java | 9 ++++ 8 files changed, 80 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
