Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-9615
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00913e0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00913e0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00913e0f Branch: refs/heads/ignite-gg-9615 Commit: 00913e0f56e315f346afac27f702a8201bfb5302 Parents: 3d3818d cd844a7 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Mon Aug 10 14:03:49 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Mon Aug 10 14:03:49 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 1 - .../dht/atomic/GridDhtAtomicCache.java | 36 ++++++++++++++------ 2 files changed, 26 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
