Merge branch 'sprint-2' into ignite-283
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/391e43f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/391e43f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/391e43f4
Branch: refs/heads/ignite-283
Commit: 391e43f4feebcb5736fb7b10f888407aeca4c58f
Parents: 3eb06ef 47fa3ce
Author: vozerov <voze...@gridgain.com>
Authored: Thu Feb 19 14:57:28 2015 +0300
Committer: vozerov <voze...@gridgain.com>
Committed: Thu Feb 19 14:57:28 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/391e43f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
