Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-cache-stmt
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1171b36b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1171b36b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1171b36b Branch: refs/heads/ignite-sql-cache-stmt Commit: 1171b36b44a7ae8838d71fa7896d1526b485fa65 Parents: 1213f2c dafad52 Author: sboikov <[email protected]> Authored: Wed Nov 25 08:48:37 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 25 08:48:37 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(-) ----------------------------------------------------------------------
