Merge remote-tracking branches 'remotes/origin/ignite-223' and 'remotes/origin/ignite-224' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e23aa0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e23aa0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e23aa0c Branch: refs/heads/ignite-281 Commit: 7e23aa0cf30daeebcb2c7fa76db99d76d2e09d5e Parents: c732207 a6e5181 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Feb 18 19:41:47 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Feb 18 19:41:47 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtCacheEntry.java | 112 ++++++++++++------- 1 file changed, 72 insertions(+), 40 deletions(-) ----------------------------------------------------------------------