Merge branches 'ignite-776' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-776
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8b18e879 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8b18e879 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8b18e879 Branch: refs/heads/ignite-157-2 Commit: 8b18e879a2b5d9b087b92b7fdc4a0409ac0ac916 Parents: 895d95b 18b4c39 Author: Andrey <anovi...@gridgain.com> Authored: Wed Apr 29 17:39:29 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed Apr 29 17:39:29 2015 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 22 +++--- .../processors/cache/IgniteCacheProxy.java | 10 +-- .../distributed/GridCacheLockAbstractTest.java | 75 ++++++++++++++++++++ .../DataStreamerMultiThreadedSelfTest.java | 2 + 4 files changed, 90 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
