Merge branch 'ignite-1189'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd844a7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd844a7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd844a7f Branch: refs/heads/ignite-1093 Commit: cd844a7f959c79e3b5e9364ab9993f1c3d4fc91e Parents: d9acbd1 e42f954 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Aug 10 13:34:03 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Aug 10 13:34:03 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 1 - .../dht/atomic/GridDhtAtomicCache.java | 36 ++++++++++++++------ 2 files changed, 26 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
