Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-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 C409EC79C for ; Thu, 7 Jun 2012 03:59:03 +0000 (UTC) Received: (qmail 88715 invoked by uid 500); 7 Jun 2012 03:59:03 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 88489 invoked by uid 500); 7 Jun 2012 03:59:03 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 88466 invoked by uid 99); 7 Jun 2012 03:59:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 03:59:02 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [209.85.210.47] (HELO mail-pz0-f47.google.com) (209.85.210.47) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 03:58:56 +0000 Received: by dalh21 with SMTP id h21so252520dal.6 for ; Wed, 06 Jun 2012 20:58:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type:content-transfer-encoding:x-gm-message-state; bh=E74Urx9evId2jURptHYRQn5kWA5mfh1kVv14sqG95bY=; b=H5Cmuq91dOx9RTjEhIwCXeRrO2u6472z0EwNO3zuuDw/tKI5FYbuIbc3Bg+hSDHDgX dBgStpsqoOP+prbjP8jmJ1SYg1JXRmF1598x8HzKKK4Qu02GdEu2rua8Tp2IkW23KAkk 1X7Os9r8NF9x5/105do/n7NZbENDXdD0DkGN8h6Jwj0B4kjH4QSvROWwodxsZeia9MAK MRiNWFTrjHT0a3QiGaw3sWMKz7+fnuRCC8Gw2o2+1WY7LmPh/GcUvilBBcPTChiMzpFm LG2R4Y2G0qB6x0nBfyfUqn2aiB271IyFJ/ponuKxQxFxiKcU57O0vV2ZqTgk+y46CkLw +2Ug== Received: by 10.68.136.229 with SMTP id qd5mr5606892pbb.2.1339041514860; Wed, 06 Jun 2012 20:58:34 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.71.137 with HTTP; Wed, 6 Jun 2012 20:58:14 -0700 (PDT) In-Reply-To: References: <6DE00C9FDF08A34683DF71786C70EBF0294ACA6B@SBPOMB402.sbp.lan> From: David Nalley Date: Wed, 6 Jun 2012 23:58:14 -0400 Message-ID: Subject: Re: Which branch to Nicira integration? To: cloudstack-dev@incubator.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQmG4U9YYWZnYGRu9yDMsF779nNWbAZOntnQsZ5DEYGlhk4OinvWYpi3aO2haDAvRWh78zOL On Wed, Jun 6, 2012 at 10:52 PM, David Nalley wrote: > On Wed, Jun 6, 2012 at 9:19 PM, Hugo Trippaers > wrote: >> Heya all, >> >> This afternoon we had a nice chat with Chiradeep about the Nicira integr= ation. It's moving along nicely know. >> >> However while setting up a test environment with a branch containing new= code, i ran into trouble with the secondary storage vm. Troubleshooting th= at i found that the master brach (which i used to base my changes on) is la= cking all build steps for the console-proxy. >> >> So my questions are >> which branch should i base my changes and eventual patch on? 3.0.x, mast= er or another one? >> If master, why is the console-proxy taken out and how to work around thi= s? >> > > > You should definitely be building off of a branch based on master in > the git repo - what errors are you seeing with the console proxy? =A0We > likely need to fix that. > > --David That's my fault. I ripped console proxy out of the build-cloud.xml when I was removing it from the RPM (no idea what possessed me to do that), and if you didn't need to build systemVMs you wouldn't have noticed it missing. I just pushed that back in - but it's no longer part of build-all - but you should be able to build it (and the rest of CloudStack) with: ant build-console-proxy build-all Let me know if you run into problems. --David