Merge branches 'ignite-187' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Conflicts:
modules/schema-load/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13764cb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13764cb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13764cb2
Branch: refs/heads/ignite-user-req
Commit: 13764cb267a6ed723220a2b6390bd1a35bf64e0d
Parents: b4b077d b0dada0
Author: AKuznetsov <[email protected]>
Authored: Thu Mar 5 17:39:10 2015 +0700
Committer: AKuznetsov <[email protected]>
Committed: Thu Mar 5 17:39:10 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../processors/cache/GridCacheAdapter.java | 11 ++++-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 4 +-
.../parser/dialect/OracleMetadataDialect.java | 45 +++++++++++---------
.../org/apache/ignite/schema/ui/MessageBox.java | 7 +++
5 files changed, 46 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
