ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [6/6] incubator-ignite git commit: Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Date Thu, 05 Mar 2015 10:39:28 GMT
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-187
Commit: 13764cb267a6ed723220a2b6390bd1a35bf64e0d
Parents: b4b077d b0dada0
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Thu Mar 5 17:39:10 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
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(-)
----------------------------------------------------------------------



Mime
View raw message