Merge branch 'ignite-1.5' into ignite-1956
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1baa1a9a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1baa1a9a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1baa1a9a Branch: refs/heads/ignite-1956 Commit: 1baa1a9a638fbdf99b5441427960e09fd0337c40 Parents: b245c22 dafad52 Author: vozerov-gridgain <[email protected]> Authored: Wed Nov 25 09:17:12 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Nov 25 09:17:12 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 9 +++-- .../processors/cache/CacheLockImpl.java | 18 ++++++++- .../colocated/GridDhtColocatedLockFuture.java | 8 ++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 42 +++++++++++++++++++- 4 files changed, 66 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
