Merge branch 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Conflicts:
README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/413b6c87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/413b6c87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/413b6c87
Branch: refs/heads/ignite-239
Commit: 413b6c87ddc422d41f95b757c079a08d97b7cb26
Parents: 5a287b1 f1ec719
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Fri Feb 20 14:03:47 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Fri Feb 20 14:03:47 2015 +0300
----------------------------------------------------------------------
README.md | 179 +++++++++++++++++++
.../processors/cache/GridCacheMapEntry.java | 12 +-
.../processors/cache/GridCacheUtils.java | 2 +-
.../GridCacheAbstractJobExecutionTest.java | 8 +-
4 files changed, 191 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
