Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58ff23ff Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58ff23ff Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58ff23ff Branch: refs/heads/ignite-1093-2 Commit: 58ff23ff495af6b672c4db98aaf2940ff67527c6 Parents: b53a525 b3d347e Author: Anton Vinogradov <[email protected]> Authored: Tue Oct 6 16:16:44 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue Oct 6 16:16:44 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLockRequest.java | 5 ++--- .../cache/GridCacheDeploymentOffHeapSelfTest.java | 15 +++++++++++++++ ...arEnabledFairAffinityMultiJvmFullApiSelfTest.java | 5 +++++ ...acheAtomicNearEnabledMultiJvmFullApiSelfTest.java | 5 +++++ .../apache/ignite/igfs/Hadoop1DualAbstractTest.java | 5 +++++ modules/yardstick/pom.xml | 10 +++++++++- 6 files changed, 41 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/58ff23ff/modules/yardstick/pom.xml ----------------------------------------------------------------------
