Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8fc14ec0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8fc14ec0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8fc14ec0 Branch: refs/heads/ignite-1.4.2 Commit: 8fc14ec004cc87d731f4d089f5b5c44c91831e40 Parents: 8616889 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Oct 6 13:36:25 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Oct 6 13:36:25 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtLockRequest.java | 5 ++--- modules/yardstick/pom.xml | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 87aa256..99c1b86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -299,8 +299,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { return accessTtl; } - /** {@inheritDoc} - * @param ctx*/ + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); @@ -529,4 +528,4 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { @Override public String toString() { return S.toString(GridDhtLockRequest.class, this, "super", super.toString()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc14ec0/modules/yardstick/pom.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml index 2f0c5fe..d18e1a9 100644 --- a/modules/yardstick/pom.xml +++ b/modules/yardstick/pom.xml @@ -59,6 +59,12 @@ </dependency> <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-log4j</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.yardstickframework</groupId> <artifactId>yardstick</artifactId> <version>${yardstick.version}</version>