Merge remote-tracking branch 'apache-git/master' into ignite-1258
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4ab415d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4ab415d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4ab415d Branch: refs/heads/ignite-1258 Commit: f4ab415dd5298528eb2015fc89cb4d931f920c1d Parents: c2ee4c4 e18147d Author: Denis Magda <dma...@gridgain.com> Authored: Wed Aug 19 16:56:44 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Aug 19 16:56:44 2015 +0300 ---------------------------------------------------------------------- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../ignite/schema/model/PojoDescriptor.java | 6 +- .../parser/dialect/OracleMetadataDialect.java | 101 ++++++++++--------- .../util/spring/IgniteSpringHelperImpl.java | 4 +- 5 files changed, 61 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
