Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyWithStoreAbstractTest.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/0db778b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0db778b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0db778b7
Branch: refs/heads/ignite-45
Commit: 0db778b7054e14de83e1848152249523e227375c
Parents: d854e3f eecc5dc
Author: Alexey Goncharuk <agoncha...@gridgain.com>
Authored: Fri Mar 20 11:05:09 2015 -0700
Committer: Alexey Goncharuk <agoncha...@gridgain.com>
Committed: Fri Mar 20 11:05:09 2015 -0700
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheUtils.java | 6 ++++--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
