Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e26c48a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e26c48a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e26c48a Branch: refs/heads/ignite-998 Commit: 8e26c48a5c838edbf3815c5585a69d03e5b4da9c Parents: 308b0c0 6a15596 Author: sboikov <sboi...@gridgain.com> Authored: Wed Jun 10 16:30:57 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jun 10 16:30:57 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 25 +++++++++++++++++- .../processors/cache/IgniteInternalCache.java | 27 ++++++-------------- 2 files changed, 32 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
