Merge remote-tracking branch 'origin/ignite-443' into ignite-443
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/version/CacheVersionConflictResolver.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/82b34192
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82b34192
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82b34192
Branch: refs/heads/ignite-424
Commit: 82b34192acf6bea99cb49cf5dab40009bfd5be88
Parents: 67b7ffd aa99733
Author: nikolay_tikhonov <[email protected]>
Authored: Tue Mar 31 11:32:56 2015 +0300
Committer: nikolay_tikhonov <[email protected]>
Committed: Tue Mar 31 11:32:56 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/GridCacheContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82b34192/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
