Merge remote-tracking branch 'origin/ignite-51' into ignite-51

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/portable/IgniteCacheObjectProcessorAdapter.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/b77698ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b77698ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b77698ba

Branch: refs/heads/ignite-user-req
Commit: b77698ba34918d994dd7e226b1d2a1d16d00082e
Parents: 2ff54f2 431897f
Author: sboikov <semen.boi...@inria.fr>
Authored: Fri Mar 6 07:40:43 2015 +0300
Committer: sboikov <semen.boi...@inria.fr>
Committed: Fri Mar 6 07:40:43 2015 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------


Reply via email to