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 1152110D36 for ; Thu, 7 May 2015 09:25:14 +0000 (UTC) Received: (qmail 142 invoked by uid 500); 7 May 2015 09:25:13 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 99986 invoked by uid 500); 7 May 2015 09:25:13 -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 99973 invoked by uid 99); 7 May 2015 09:25:13 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 May 2015 09:25:13 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id B98EDC2256 for ; Thu, 7 May 2015 09:25:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.88 X-Spam-Level: ** X-Spam-Status: No, score=2.88 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id EHPfviZ2Uz9m for ; Thu, 7 May 2015 09:25:10 +0000 (UTC) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTPS id 616A5286DD for ; Thu, 7 May 2015 09:17:42 +0000 (UTC) Received: by laat2 with SMTP id t2so26043040laa.1 for ; Thu, 07 May 2015 02:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=G8pkggnUd4NITVOoWot4lmybSjAvUmirZKOmgYKzqOY=; b=BnCAqWgsvqhSmgCchmbUWOcBOkdGZjpgPoUG9ykWfIdngJArqH90Myqvp3p9UW75/q XNzh8v7xtdyZEdJ3ByXZLeeIIH1XzQbFqaHb8cRoDZyCuxii8Ita3bEz3mbn1kAm7yXL hILW3jWbMQHu0Q2IHEYZa1CEd8TIdsk9ABryaSW/8LKJxJpTttji2BPbUwvbq+F6HPiN MSl8JaXNypCh97ReQRfCqDW4PkU25WLvZQ0yfm3eWGIm/B1zxBPmPFk8i0b6/todfZdH W62kKeieIsg7zgOuju4XzORaEi5a7JEkN5CBic0cRYDQchAcpAcGF4kMqpfKZ57vLRwO BcLA== X-Received: by 10.112.199.35 with SMTP id jh3mr2256154lbc.23.1430990254675; Thu, 07 May 2015 02:17:34 -0700 (PDT) MIME-Version: 1.0 From: Daan Hoogland Date: Thu, 07 May 2015 09:17:34 +0000 Message-ID: Subject: [ANNOUNCE][PROPOSAL] merge of 4.5 code in master To: dev Content-Type: multipart/alternative; boundary=001a11c34a7ace9f8505157a61d6 --001a11c34a7ace9f8505157a61d6 Content-Type: text/plain; charset=UTF-8 LS, announce part: As we have an rc that did not get any -1 yet I want to merge 4.5 in master now. It will result in 389 commits being merged without conflicts detectable by git. That is not an fool proof guarantee of a working system of course, hence this heads up. proposal part: I would like to merge back the last release branch as part of the release candidate creation script. First as part of the procedure, later in build_asf.sh. +/-1? --001a11c34a7ace9f8505157a61d6--