Merge branch 'master' into ignite-2926 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3285e2c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3285e2c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3285e2c Branch: refs/heads/ignite-2926 Commit: b3285e2cb28a800073a8d33ee45979aa957c4995 Parents: 15869f3 c19d38b Author: vozerov-gridgain <[email protected]> Authored: Fri Apr 15 12:20:21 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Apr 15 12:20:21 2016 +0300 ---------------------------------------------------------------------- .../ignite/schema/generator/GeneratorUtils.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) ----------------------------------------------------------------------
