Merge branch '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/401835cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/401835cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/401835cc Branch: refs/heads/sprint-2 Commit: 401835cc63fcf7f4412397eb953d41a2599a66c4 Parents: 10bb0da ae413fb Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Mar 5 12:04:41 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Mar 5 12:04:41 2015 +0300 ---------------------------------------------------------------------- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 4 +- .../parser/dialect/JdbcMetadataDialect.java | 95 ++++++++++---------- 2 files changed, 49 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
