Return-Path: X-Original-To: apmail-curator-dev-archive@minotaur.apache.org Delivered-To: apmail-curator-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 518741878C for ; Wed, 20 May 2015 05:38:48 +0000 (UTC) Received: (qmail 12728 invoked by uid 500); 20 May 2015 05:38:48 -0000 Delivered-To: apmail-curator-dev-archive@curator.apache.org Received: (qmail 12678 invoked by uid 500); 20 May 2015 05:38:48 -0000 Mailing-List: contact dev-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list dev@curator.apache.org Received: (qmail 12667 invoked by uid 99); 20 May 2015 05:38:47 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 May 2015 05:38:47 +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 6EF9E183724 for ; Wed, 20 May 2015 05:38:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 4 X-Spam-Level: **** X-Spam-Status: No, score=4 tagged_above=-999 required=6.31 tests=[HTML_MESSAGE=3, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id qcCwZriD3LcU for ; Wed, 20 May 2015 05:38:38 +0000 (UTC) Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTPS id 133B324960 for ; Wed, 20 May 2015 05:38:37 +0000 (UTC) Received: by pdbqa5 with SMTP id qa5so55440423pdb.0 for ; Tue, 19 May 2015 22:38:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-type; bh=6LfINzp21SBsrFer1XuqrRLS+Uy5jzeWKKPJDL2Ss/s=; b=C2lgzJ6GNC7mIRJRu7wMiJdPkCfcqIoO82iePB1cvQaMGVLiMP5Jt4N/pjdr1U4uqn gWAoxirInXp0rlUDTV92cD4sUva+CWUO0BOFLwd3HvOOib8Cnaia44V/eE9Ro8B04R4b Eu4YlzC8lz8uwqs+vP37R389fomSfThWllwwcCLVMsNPZaG+4K9V4fc3ZWtmB3IaotyM tpCfjdqw90Po6unQL6e4OEbNnHcQn5yiGF7LlSmmB3vds7AM8T8qppXMv/aMi0dCsUuY rK5y7gTtqwJ2ZH7asB5UDuhXwZzWNW08LOvA92PhAcQFerZjo6uGoCuS1rmnxdj1zdtQ Q8nw== X-Gm-Message-State: ALoCoQmByu+8J7gZ8sWtseozfLNB0ndA/80n+I0WNOu2HisDGQL8BRBwdCVkzvooUCDvpZhguttE X-Received: by 10.70.101.231 with SMTP id fj7mr61343209pdb.84.1432100316550; Tue, 19 May 2015 22:38:36 -0700 (PDT) Received: from Jordans-MacBook-Pro-2.local (173-11-86-161-SFBA.hfc.comcastbusiness.net. [173.11.86.161]) by mx.google.com with ESMTPSA id pw9sm14837350pac.27.2015.05.19.22.38.35 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 May 2015 22:38:35 -0700 (PDT) Date: Tue, 19 May 2015 22:38:34 -0700 From: Jordan Zimmerman To: Cameron McKenzie Cc: "=?utf-8?Q?dev=40curator.apache.org?=" Message-ID: In-Reply-To: References: Subject: Re: CURATOR-161 X-Mailer: Airmail (303) MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="555c1dda_7d812c90_1fdb" --555c1dda_7d812c90_1fdb Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline However, you can just run: mvn license:format Yourself and it should be fine. maybe try that On May 19, 2015 at 9:22:32 PM, Cameron McKenzie (mckenzie.cam=40gmail.com= ) wrote: Jordan, I noticed that in CURATOR-217 you fixed up the license headers of a bunch= of the files that were committed as part of CURATOR-161. I don't want to= merge CURATOR-161 back to the 3.0 branch without the headers as I think = it will break the build. So, what's the best way forward=3F Do you just w= ant to merge CURATOR-217 back to the 3.0 branch given that it already con= tains all of the CURATOR-161 changes=3F cheers On Wed, May 20, 2015 at 9:23 AM, Jordan Zimmerman wrote: https://github.com/apache/curator/pull/82 On May 19, 2015 at 4:18:36 PM, Cameron McKenzie (mckenzie.cam=40gmail.com= ) wrote: Thanks Jordan, Will have a look at the PR. cheers On Wed, May 20, 2015 at 9:17 AM, Jordan Zimmerman wrote: I=E2=80=99ll have a look. Also, I already started on integrating watcher = removal as I have strong ideas on it. Here=E2=80=99s the current PR:=C2=A0= https://github.com/apache/curator/pull/80 -JZ On May 19, 2015 at 4:06:03 PM, Cameron McKenzie (cammckenzie=40apache.org= ) wrote: Guys, If anyone's got a spare few minutes could they please review the final changes to CURATOR-161. If we're happy with the implementation then I'll merge into the 3.0 branch and then start work on getting the recipes to u= se the watcher removal stuff. cheers Cam --555c1dda_7d812c90_1fdb--