Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D065218409 for ; Mon, 18 May 2015 11:14:48 +0000 (UTC) Received: (qmail 2954 invoked by uid 500); 18 May 2015 11:14:48 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 2899 invoked by uid 500); 18 May 2015 11:14:48 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 2887 invoked by uid 99); 18 May 2015 11:14:48 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 May 2015 11:14:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 9997C1A2E91 for ; Mon, 18 May 2015 11:14:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.901 X-Spam-Level: ** X-Spam-Status: No, score=2.901 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=3, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamd2-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id xw6MlFj-pX0T for ; Mon, 18 May 2015 11:14:33 +0000 (UTC) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTPS id 058FC253EF for ; Mon, 18 May 2015 11:14:33 +0000 (UTC) Received: by lagv1 with SMTP id v1so214104053lag.3 for ; Mon, 18 May 2015 04:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :content-type; bh=lhCyZ4qx5xxBGqf+faSWL8OqCjl7+/QPOYIAaqDLCfM=; b=dqrEbvvt03MPpnuybQcQbNZYTFiSnKgJDcdeflairKZp1PoiMwdy8Wqz17K4/bfX+3 aMrFkwRZHI+nAHt3hdykhREFLdo2qCAcuRCbA81slCrcMjZFd4CQiGcLV41nHWH7TmE1 9x/httd4eVo7+DI/kJfOnpynX7XixBAKVPzbsmbQjYKmh8YAiZm+PjPK2XwYoJ49bgbO 5j3JuoQAkMA4klM2HgjnTuRXs1cIu03hg6Gxggk6DvemkMC6j3HRH1me/3kPp5KImidu ZMm74zSOhkcxQS09xHwxTbCWs1Gh6TUhf6UgFRu+2HXAWjQRlQnM5uWCAa9YO8/oBWHD 24MQ== X-Received: by 10.152.27.162 with SMTP id u2mr16549407lag.22.1431947672432; Mon, 18 May 2015 04:14:32 -0700 (PDT) MIME-Version: 1.0 References: <5559A21F.6020103@renemoser.net> <85B56B1AEDD2674A82DEC8B61E12182925994FEF@AMSPEX01CL01.citrite.net> <85B56B1AEDD2674A82DEC8B61E1218292599506E@AMSPEX01CL01.citrite.net> <7DBAEC08-5F0B-4938-9469-59638DABA534@schubergphilis.com> In-Reply-To: From: Daan Hoogland Date: Mon, 18 May 2015 11:14:30 +0000 Message-ID: Subject: Re: Preparing for 4.6 To: dev Content-Type: multipart/alternative; boundary=089e0158c1665a39990516594c46 --089e0158c1665a39990516594c46 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I don't like the writing of a changelog in the root, it is in git already. The comments should be good and describing the changes. The changes should be small enough to be described adequately in a short changelog. That's why I don't like squashing anything but the very trivial. Op ma 18 mei 2015 om 11:50 schreef Erik Weber : > On a related note, commits should reference the JIRA ticket as well. > > -- > Erik > > On Mon, May 18, 2015 at 11:27 AM, Wilder Rodrigues < > WRodrigues@schubergphilis.com> wrote: > > > Okay, > > > > +1 for create the ACS Jira issue for improvements as well. > > > > Since Xen and Libvirt redesign will be on 4.6 - and are already > documented > > - I will just create 2 issues so we have a way of keeping track of them= . > > > > Cheers, > > Wilder > > > > > > On 18 May 2015, at 11:16, Stephen Turner > > wrote: > > > > Speaking for my XenCenter team again, for things like that we would hav= e > > an improvement ticket, pointing to the wiki page. > > > > By the way, this also allows us to schedule the work on our sprint, but > we > > had the policy even before we were doing Scrum. In a large, distributed= , > > volunteer organisation, I would argue that it's even more important to = be > > able to trace the change back to its reason, now and later. > > > > -- > > Stephen Turner > > > > > > -----Original Message----- > > From: Wilder Rodrigues [mailto:WRodrigues@schubergphilis.com] > > Sent: 18 May 2015 10:11 > > To: dev@cloudstack.apache.org > > Subject: Re: Preparing for 4.6 > > > > Hi there, > > > > I agree with the Jira ticket for the "new features, important fixes, > > security fixes" > > > > But I don=E2=80=99t think only about "new features, important fixes, se= curity > > fixes=E2=80=9D. I put most of my time in make the code better and teste= d, for > what > > we call refactoring/rewriting/redesigning. Should we also create Jira > > issues for that and mark them as Improvement? > > > > Taking into account the [VPC] Virtual Router, Citrix Resource Base and > > Libvirt Computing Resource refactoring, we had only internal issues on > > Jira. However, the changes have been documented on the 4.5/4.6 sections > of > > the Apache / Developers / Design Documents wiki: > > > > > > > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Refactor+for+Redun= dant+Virtual+Router+Implementation > > > > > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Refactoring+XenSer= ver+Hypervisor+Plugin > > > > The Libvirt documentation is on its way, since the PR was pushed only > last > > week. > > > > Cheers, > > Wilder > > > > > > On 18 May 2015, at 10:39, Stephen Turner > > > > wrote: > > > > In my XenCenter dev team at Citrix, we have the policy of requiring a > > ticket number on every commit. If we find a bug and there isn't already= a > > ticket, we create a ticket before committing the fix. I guess I've just > dug > > through history too many times to understand why something that appears > > wrong was done, only to find an inadequate description at the end of th= e > > trail. > > > > -- > > Stephen Turner > > > > > > -----Original Message----- > > From: Erik Weber [mailto:terbolous@gmail.com] > > Sent: 18 May 2015 09:32 > > To: dev > > Subject: Re: Preparing for 4.6 > > > > On Mon, May 18, 2015 at 10:26 AM, Rene Moser > mail@renemoser.net>> wrote: > > > > Hi > > > > On 15.05.2015 11:27, Sebastien Goasguen wrote: > > Folks, > > > > As we prepare to try a new process for 4.6 release it would be nice to > > start paying attention to master. > > > > - Good commit messages > > > > The question is, what makes a commit message good? Maybe this helps: > > > > http://secure-web.cisco.com/1cOtAU9lruLvoJl9SBdNSTHN6eyvml6nO5JlwT8_V2 > > d_Y7wsnHAV3NiHTOya0cRQyt1WuG_fzithwjk4Qu-l3usM-B_yzy7V4qaxtoDIlEixysid > > QZ0ZbuK0YMNgknwBUaRUBJYNkjfGoppsXIpUXcmRvOH565otFMCmJUX2mfkrj_z5Vwm0wh > > PDqu2ZkGk1a/http%3A%2F%2Fchris.beams.io%2Fposts%2Fgit-commit%2F > > > > - Reference to a JIRA bug > > > > Must there be a JIRA bug? I did some commits without jira bugs in the > > past. But I noticed that those are not "tracked" in the changelog of th= e > > new release. So should there be a policy (is there?) that there must be= a > > jira bug for fixes? > > > > > > I believe there should be a JIRA bug for most things. JIRA is a good > place > > to document why you're doing something, it's also easy to use as a sour= ce > > for release notes as you discovered. > > It's also good practice to document bugs/fixes, it's generally easier t= o > > find JIRA bugs than it is to find commit messages - especially for > > non-developers / newbies. > > > > For major code commits (new features, important fixes, security fixes) > I'd > > say it should be a requirement, but I don't know if it already is or no= t. > > > > > > > > - Squashing commits ( cc/ wilder :)) > > > > This really depends. I would not generally prefer squashing commits. > > > > The example of > > https://github.com/apache/cloudstack/commits/master?page=3D2 is more an > > example of "bad" commit messages. > > > > If you look at the commits, they make sense but the commit message > > indicates that they cover similar work in different aspects, which they > > actually don't. > > > > But if you look at this example here > > > > https://github.com/ansible/ansible-modules-extras/commits/devel?author > > =3Dgregdek where you can see dozens of similar commits, those should be > > squashed. > > > > > > > > +1 to squashing related commits where it makes sense to do so > > -1 to a general rule of squashing the whole PR > > > > -- > > Erik > > > > > --089e0158c1665a39990516594c46--