Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0798e6f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0798e6f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0798e6f1 Branch: refs/heads/ignite-264 Commit: 0798e6f1764aaf3e8101383b7a8ac3d7ed9b9d2c Parents: bd770a5 cd844a7 Author: sboikov <sboi...@gridgain.com> Authored: Mon Aug 10 16:08:49 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Aug 10 16:08:49 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 1 - .../dht/atomic/GridDhtAtomicCache.java | 36 ++++++++++++++------ 2 files changed, 26 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
