Merge remote-tracking branch 'origin/ignite-946' into ignite-946
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f16eb16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f16eb16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f16eb16 Branch: refs/heads/master Commit: 9f16eb165f2aad48f05cef17f608eb2898c078a3 Parents: 92e81dc 53557e3 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Aug 10 09:58:27 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Aug 10 09:58:27 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/version/package-info.java | 4 ++-- .../processors/cache/CacheInvokeEntry.java | 5 +++-- .../cache/transactions/IgniteTxEntry.java | 4 +++- .../cache/transactions/IgniteTxLocalAdapter.java | 18 +++++++++--------- 4 files changed, 17 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
