Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 265E5200B6B for ; Fri, 15 Jul 2016 00:48:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 24FFE160A85; Thu, 14 Jul 2016 22:48:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6E251160A88 for ; Fri, 15 Jul 2016 00:48:53 +0200 (CEST) Received: (qmail 11355 invoked by uid 500); 14 Jul 2016 22:48:52 -0000 Mailing-List: contact commits-help@fluo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fluo.incubator.apache.org Delivered-To: mailing list commits@fluo.incubator.apache.org Received: (qmail 11336 invoked by uid 99); 14 Jul 2016 22:48:52 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2016 22:48:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 1C2151806F7 for ; Thu, 14 Jul 2016 22:48:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id BDts5KEYheJA for ; Thu, 14 Jul 2016 22:48:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 02E1860D25 for ; Thu, 14 Jul 2016 22:48:48 +0000 (UTC) Received: (qmail 11242 invoked by uid 99); 14 Jul 2016 22:48:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2016 22:48:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F37A1E964E; Thu, 14 Jul 2016 22:48:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@fluo.incubator.apache.org Date: Thu, 14 Jul 2016 22:48:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] incubator-fluo git commit: Updates to dependency versions in pom and docs archived-at: Thu, 14 Jul 2016 22:48:54 -0000 Updates to dependency versions in pom and docs * Made required Java version 8+ * Made Accumulo version 1.6.5 in pom to reflect docs * Made Hadoop version 2.6+ in docs to reflect pom * Fixed it instance name variable Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/5ebe3866 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/5ebe3866 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/5ebe3866 Branch: refs/heads/master Commit: 5ebe38660fe3f05995d07d65ceeab9b61b6a41e1 Parents: 2f32661 Author: Mike Walch Authored: Thu Jul 14 15:55:10 2016 -0400 Committer: Mike Walch Committed: Thu Jul 14 16:07:09 2016 -0400 ---------------------------------------------------------------------- docs/prod-fluo-setup.md | 4 ++-- .../fluo/integration/impl/GarbageCollectionIteratorIT.java | 3 +-- pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/5ebe3866/docs/prod-fluo-setup.md ---------------------------------------------------------------------- diff --git a/docs/prod-fluo-setup.md b/docs/prod-fluo-setup.md index e2015ca..df4a26c 100644 --- a/docs/prod-fluo-setup.md +++ b/docs/prod-fluo-setup.md @@ -12,9 +12,9 @@ Before you install Fluo, you will need the following installed and running on your local machine or cluster: * [Accumulo][Accumulo] (version 1.6+) -* [Hadoop][Hadoop] (version 2.2+) +* [Hadoop][Hadoop] (version 2.6+) * [Zookeeper] -* [Java][Java] (version 7+) +* [Java][Java] (version 8+) Obtain a distribution --------------------- http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/5ebe3866/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java ---------------------------------------------------------------------- diff --git a/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java b/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java index 0451f16..ac713bc 100644 --- a/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java +++ b/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import com.google.common.collect.Iterables; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.admin.CompactionConfig; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.PartialKey; import org.apache.accumulo.core.data.Value; @@ -166,7 +165,7 @@ public class GarbageCollectionIteratorIT extends ITBaseImpl { Assert.assertEquals(0, countInTable("-DATA")); // compact should drop all del locks except for primary - conn.tableOperations().compact(table, new CompactionConfig().setWait(true)); + conn.tableOperations().compact(table, null, null, true, true); Assert.assertEquals(0, countInTable("-LOCK")); Assert.assertEquals(1, countInTable("-DEL_LOCK")); http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/5ebe3866/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 16cf544..b4bf85b 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ https://github.com/apache/incubator-fluo/issues - 1.7.1 + 1.6.5 2.7.1 0.8.1 9 @@ -293,8 +293,8 @@ maven-failsafe-plugin - it-instance-maven - false + it-instance-maven + false