You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Rohit Yadav <bh...@apache.org> on 2013/02/11 18:02:49 UTC
Re: Diff stat master vs 4.1
+1
There a lot of commits on master which are not backported to 4.1, for
example packaging stuff etc. Bug fixes (for 4.1) should go in both
master and 4.1, so let's save some trouble for our release manager and
as developers take the responsibility to cherry-pick/backport on 4.1.
Regards.
On Mon, Feb 11, 2013 at 10:27 PM, Hugo Trippaers
<HT...@schubergphilis.com> wrote:
> Hey all,
>
> Just a reminder; Master and 4.1 are starting to diverge, this is not necessarily a bad thing at this time, but please make sure that any fixes you make for 4.1 are pushed into both trees.
>
> [spark@cloudstack-dev5 incubator-cloudstack]$ git status
> # On branch 4.1
> nothing to commit (working directory clean)
> [spark@cloudstack-dev5 incubator-cloudstack]$ git diff --stat master
> agent/test/com/cloud/agent/TestAgentShell.java | 2 +-
> .../cloud/exception/PermissionDeniedException.java | 4 +
> .../com/cloud/exception/RequestLimitException.java | 3 +-
> api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +-
> docs/en-US/Admin_Guide.xml | 2 +-
> docs/en-US/Book_Info.xml | 2 +-
> docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 5 +-
> docs/en-US/Developers_Guide.xml | 2 +-
> docs/en-US/Installation_Guide.xml | 2 +-
> .../change-network-offering-on-guest-network.xml | 4 +-
> docs/en-US/creating-network-offerings.xml | 2 +-
> docs/en-US/hypervisor-host-install-libvirt.xml | 12 +-
> docs/en-US/prepare-system-vm-template.xml | 29 +-
> docs/en-US/security-groups.xml | 2 +-
> ...pgrade-virtual-router-with-service-offering.xml | 3 +-
> packaging/centos63/cloud.spec | 3 +-
> .../ratelimit/ApiRateLimitServiceImpl.java | 2 +-
> .../networkservice/AddBaremetalDhcpCmd.java | 3 +-
> .../AddBaremetalKickStartPxeCmd.java | 3 +-
> .../networkservice/AddBaremetalPxeCmd.java | 2 +-
> .../networkservice/BaremetalDhcpResponse.java | 4 +
> .../BaremetalPxeKickStartResponse.java | 5 +-
> .../networkservice/BaremetalPxePingResponse.java | 4 +-
> .../networkservice/ListBaremetalDhcpCmd.java | 3 +-
> .../ListBaremetalPxePingServersCmd.java | 3 +-
> .../kvm/resource/LibvirtComputingResource.java | 149 +++-
> scripts/storage/secondary/cloud-install-sys-tmplt | 16 +-
> scripts/vm/hypervisor/xenserver/vmops | 1 -
> server/src/com/cloud/api/ApiServer.java | 20 +-
> .../src/com/cloud/network/NetworkManagerImpl.java | 13 +-
> server/src/com/cloud/vm/UserVmManagerImpl.java | 31 +-
> tools/apidoc/generateadmincommands.xsl | 2 +-
> tools/apidoc/generatedomainadmincommands.xsl | 2 +-
> tools/apidoc/generatetoc_header.xsl | 2 +-
> tools/apidoc/generateusercommands.xsl | 2 +-
> .../appliance/definitions/systemvmtemplate/LICENSE | 21 -
> .../appliance/definitions/systemvmtemplate/base.sh | 45 -
> .../definitions/systemvmtemplate/cleanup.sh | 37 -
> .../systemvmtemplate/cloudstack-packages.sh | 151 ----
> .../definitions/systemvmtemplate/config.dat | 878 --------------------
> .../definitions/systemvmtemplate/definition.rb | 6 +-
> .../definitions/systemvmtemplate/postinstall.sh | 46 +-
> .../definitions/systemvmtemplate/preseed.cfg | 16 +-
> .../definitions/systemvmtemplate/zerodisk.sh | 23 -
> .../cloud/utils/component/ComponentContext.java | 7 +-
> 45 files changed, 264 insertions(+), 1313 deletions(-)
>
> Cheers,
>
> Hugo
RE: Diff stat master vs 4.1
Posted by Animesh Chaturvedi <an...@citrix.com>.
Yes agreed we should first fix an issue in 4.1 and then port into master
Animesh
> -----Original Message-----
> From: Alex Huang [mailto:Alex.Huang@citrix.com]
> Sent: Monday, February 11, 2013 9:39 AM
> To: Hugo Trippaers; 'Rohit Yadav'
> Cc: cloudstack-dev@incubator.apache.org
> Subject: RE: Diff stat master vs 4.1
>
> I don't want to speak for Chip here but I would prefer the other way.
>
> The developers should create issues on jira as to why it's being fixed in 4.1,
> check it into 4.1, and cherry-pick to master.
>
> Just checking into master and then back-port to 4.1 also creates issue with
> exactly what should go in.
>
> --Alex
>
> > -----Original Message-----
> > From: Hugo Trippaers [mailto:HTrippaers@schubergphilis.com]
> > Sent: Monday, February 11, 2013 9:06 AM
> > To: 'Rohit Yadav'
> > Cc: cloudstack-dev@incubator.apache.org
> > Subject: RE: Diff stat master vs 4.1
> >
> >
> >
> > > -----Original Message-----
> > > From: rohityadav89@gmail.com [mailto:rohityadav89@gmail.com] On
> > Behalf
> > > Of Rohit Yadav
> > > Sent: Monday, February 11, 2013 6:03 PM
> > > To: Hugo Trippaers
> > > Cc: cloudstack-dev@incubator.apache.org
> > > Subject: Re: Diff stat master vs 4.1
> > >
> > > +1
> > >
> > > There a lot of commits on master which are not backported to 4.1,
> > > for example packaging stuff etc. Bug fixes (for 4.1) should go in
> > > both master
> > and
> > > 4.1, so let's save some trouble for our release manager and as
> > > developers take the responsibility to cherry-pick/backport on 4.1.
> >
> > Packaging rpm should be completely cherry-picked into 4.1. I test on
> > master and if my tests are ok I backport to 4.1
> >
> > >
> > > Regards.
> > >
> > > On Mon, Feb 11, 2013 at 10:27 PM, Hugo Trippaers
> > > <HT...@schubergphilis.com> wrote:
> > > > Hey all,
> > > >
> > > > Just a reminder; Master and 4.1 are starting to diverge, this is
> > > > not
> > > necessarily a bad thing at this time, but please make sure that any
> > > fixes you make for 4.1 are pushed into both trees.
> > > >
> > > > [spark@cloudstack-dev5 incubator-cloudstack]$ git status # On
> > > > branch
> > > > 4.1 nothing to commit (working directory clean)
> > > > [spark@cloudstack-dev5 incubator-cloudstack]$ git diff --stat master
> > > > agent/test/com/cloud/agent/TestAgentShell.java | 2 +-
> > > > .../cloud/exception/PermissionDeniedException.java | 4 +
> > > > .../com/cloud/exception/RequestLimitException.java | 3 +-
> > > > api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +-
> > > > docs/en-US/Admin_Guide.xml | 2 +-
> > > > docs/en-US/Book_Info.xml | 2 +-
> > > > docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 5 +-
> > > > docs/en-US/Developers_Guide.xml | 2 +-
> > > > docs/en-US/Installation_Guide.xml | 2 +-
> > > > .../change-network-offering-on-guest-network.xml | 4 +-
> > > > docs/en-US/creating-network-offerings.xml | 2 +-
> > > > docs/en-US/hypervisor-host-install-libvirt.xml | 12 +-
> > > > docs/en-US/prepare-system-vm-template.xml | 29 +-
> > > > docs/en-US/security-groups.xml | 2 +-
> > > > ...pgrade-virtual-router-with-service-offering.xml | 3 +-
> > > > packaging/centos63/cloud.spec | 3 +-
> > > > .../ratelimit/ApiRateLimitServiceImpl.java | 2 +-
> > > > .../networkservice/AddBaremetalDhcpCmd.java | 3 +-
> > > > .../AddBaremetalKickStartPxeCmd.java | 3 +-
> > > > .../networkservice/AddBaremetalPxeCmd.java | 2 +-
> > > > .../networkservice/BaremetalDhcpResponse.java | 4 +
> > > > .../BaremetalPxeKickStartResponse.java | 5 +-
> > > > .../networkservice/BaremetalPxePingResponse.java | 4 +-
> > > > .../networkservice/ListBaremetalDhcpCmd.java | 3 +-
> > > > .../ListBaremetalPxePingServersCmd.java | 3 +-
> > > > .../kvm/resource/LibvirtComputingResource.java | 149 +++-
> > > > scripts/storage/secondary/cloud-install-sys-tmplt | 16 +-
> > > > scripts/vm/hypervisor/xenserver/vmops | 1 -
> > > > server/src/com/cloud/api/ApiServer.java | 20 +-
> > > > .../src/com/cloud/network/NetworkManagerImpl.java | 13 +-
> > > > server/src/com/cloud/vm/UserVmManagerImpl.java | 31 +-
> > > > tools/apidoc/generateadmincommands.xsl | 2 +-
> > > > tools/apidoc/generatedomainadmincommands.xsl | 2 +-
> > > > tools/apidoc/generatetoc_header.xsl | 2 +-
> > > > tools/apidoc/generateusercommands.xsl | 2 +-
> > > > .../appliance/definitions/systemvmtemplate/LICENSE | 21 -
> > > > .../appliance/definitions/systemvmtemplate/base.sh | 45 -
> > > > .../definitions/systemvmtemplate/cleanup.sh | 37 -
> > > > .../systemvmtemplate/cloudstack-packages.sh | 151 ----
> > > > .../definitions/systemvmtemplate/config.dat | 878 --------------------
> > > > .../definitions/systemvmtemplate/definition.rb | 6 +-
> > > > .../definitions/systemvmtemplate/postinstall.sh | 46 +-
> > > > .../definitions/systemvmtemplate/preseed.cfg | 16 +-
> > > > .../definitions/systemvmtemplate/zerodisk.sh | 23 -
> > > > .../cloud/utils/component/ComponentContext.java | 7 +-
> > > > 45 files changed, 264 insertions(+), 1313 deletions(-)
> > > >
> > > > Cheers,
> > > >
> > > > Hugo
Re: Diff stat master vs 4.1
Posted by Chip Childers <ch...@sungard.com>.
On Mon, Feb 11, 2013 at 09:39:08AM -0800, Alex Huang wrote:
> I don't want to speak for Chip here but I would prefer the other way.
>
> The developers should create issues on jira as to why it's being fixed in 4.1, check it into 4.1, and cherry-pick to master.
>
> Just checking into master and then back-port to 4.1 also creates issue with exactly what should go in.
>
> --Alex
I honestly don't have a preference or opinion. I do both, depending on
what and when I'm making a change between master and a release branch.
Just use your heads, and do the right thing!
RE: Diff stat master vs 4.1
Posted by Alex Huang <Al...@citrix.com>.
I don't want to speak for Chip here but I would prefer the other way.
The developers should create issues on jira as to why it's being fixed in 4.1, check it into 4.1, and cherry-pick to master.
Just checking into master and then back-port to 4.1 also creates issue with exactly what should go in.
--Alex
> -----Original Message-----
> From: Hugo Trippaers [mailto:HTrippaers@schubergphilis.com]
> Sent: Monday, February 11, 2013 9:06 AM
> To: 'Rohit Yadav'
> Cc: cloudstack-dev@incubator.apache.org
> Subject: RE: Diff stat master vs 4.1
>
>
>
> > -----Original Message-----
> > From: rohityadav89@gmail.com [mailto:rohityadav89@gmail.com] On
> Behalf
> > Of Rohit Yadav
> > Sent: Monday, February 11, 2013 6:03 PM
> > To: Hugo Trippaers
> > Cc: cloudstack-dev@incubator.apache.org
> > Subject: Re: Diff stat master vs 4.1
> >
> > +1
> >
> > There a lot of commits on master which are not backported to 4.1, for
> > example packaging stuff etc. Bug fixes (for 4.1) should go in both master
> and
> > 4.1, so let's save some trouble for our release manager and as developers
> > take the responsibility to cherry-pick/backport on 4.1.
>
> Packaging rpm should be completely cherry-picked into 4.1. I test on master
> and if my tests are ok I backport to 4.1
>
> >
> > Regards.
> >
> > On Mon, Feb 11, 2013 at 10:27 PM, Hugo Trippaers
> > <HT...@schubergphilis.com> wrote:
> > > Hey all,
> > >
> > > Just a reminder; Master and 4.1 are starting to diverge, this is not
> > necessarily a bad thing at this time, but please make sure that any fixes you
> > make for 4.1 are pushed into both trees.
> > >
> > > [spark@cloudstack-dev5 incubator-cloudstack]$ git status # On branch
> > > 4.1 nothing to commit (working directory clean)
> > > [spark@cloudstack-dev5 incubator-cloudstack]$ git diff --stat master
> > > agent/test/com/cloud/agent/TestAgentShell.java | 2 +-
> > > .../cloud/exception/PermissionDeniedException.java | 4 +
> > > .../com/cloud/exception/RequestLimitException.java | 3 +-
> > > api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +-
> > > docs/en-US/Admin_Guide.xml | 2 +-
> > > docs/en-US/Book_Info.xml | 2 +-
> > > docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 5 +-
> > > docs/en-US/Developers_Guide.xml | 2 +-
> > > docs/en-US/Installation_Guide.xml | 2 +-
> > > .../change-network-offering-on-guest-network.xml | 4 +-
> > > docs/en-US/creating-network-offerings.xml | 2 +-
> > > docs/en-US/hypervisor-host-install-libvirt.xml | 12 +-
> > > docs/en-US/prepare-system-vm-template.xml | 29 +-
> > > docs/en-US/security-groups.xml | 2 +-
> > > ...pgrade-virtual-router-with-service-offering.xml | 3 +-
> > > packaging/centos63/cloud.spec | 3 +-
> > > .../ratelimit/ApiRateLimitServiceImpl.java | 2 +-
> > > .../networkservice/AddBaremetalDhcpCmd.java | 3 +-
> > > .../AddBaremetalKickStartPxeCmd.java | 3 +-
> > > .../networkservice/AddBaremetalPxeCmd.java | 2 +-
> > > .../networkservice/BaremetalDhcpResponse.java | 4 +
> > > .../BaremetalPxeKickStartResponse.java | 5 +-
> > > .../networkservice/BaremetalPxePingResponse.java | 4 +-
> > > .../networkservice/ListBaremetalDhcpCmd.java | 3 +-
> > > .../ListBaremetalPxePingServersCmd.java | 3 +-
> > > .../kvm/resource/LibvirtComputingResource.java | 149 +++-
> > > scripts/storage/secondary/cloud-install-sys-tmplt | 16 +-
> > > scripts/vm/hypervisor/xenserver/vmops | 1 -
> > > server/src/com/cloud/api/ApiServer.java | 20 +-
> > > .../src/com/cloud/network/NetworkManagerImpl.java | 13 +-
> > > server/src/com/cloud/vm/UserVmManagerImpl.java | 31 +-
> > > tools/apidoc/generateadmincommands.xsl | 2 +-
> > > tools/apidoc/generatedomainadmincommands.xsl | 2 +-
> > > tools/apidoc/generatetoc_header.xsl | 2 +-
> > > tools/apidoc/generateusercommands.xsl | 2 +-
> > > .../appliance/definitions/systemvmtemplate/LICENSE | 21 -
> > > .../appliance/definitions/systemvmtemplate/base.sh | 45 -
> > > .../definitions/systemvmtemplate/cleanup.sh | 37 -
> > > .../systemvmtemplate/cloudstack-packages.sh | 151 ----
> > > .../definitions/systemvmtemplate/config.dat | 878 --------------------
> > > .../definitions/systemvmtemplate/definition.rb | 6 +-
> > > .../definitions/systemvmtemplate/postinstall.sh | 46 +-
> > > .../definitions/systemvmtemplate/preseed.cfg | 16 +-
> > > .../definitions/systemvmtemplate/zerodisk.sh | 23 -
> > > .../cloud/utils/component/ComponentContext.java | 7 +-
> > > 45 files changed, 264 insertions(+), 1313 deletions(-)
> > >
> > > Cheers,
> > >
> > > Hugo
RE: Diff stat master vs 4.1
Posted by Hugo Trippaers <HT...@schubergphilis.com>.
> -----Original Message-----
> From: rohityadav89@gmail.com [mailto:rohityadav89@gmail.com] On Behalf
> Of Rohit Yadav
> Sent: Monday, February 11, 2013 6:03 PM
> To: Hugo Trippaers
> Cc: cloudstack-dev@incubator.apache.org
> Subject: Re: Diff stat master vs 4.1
>
> +1
>
> There a lot of commits on master which are not backported to 4.1, for
> example packaging stuff etc. Bug fixes (for 4.1) should go in both master and
> 4.1, so let's save some trouble for our release manager and as developers
> take the responsibility to cherry-pick/backport on 4.1.
Packaging rpm should be completely cherry-picked into 4.1. I test on master and if my tests are ok I backport to 4.1
>
> Regards.
>
> On Mon, Feb 11, 2013 at 10:27 PM, Hugo Trippaers
> <HT...@schubergphilis.com> wrote:
> > Hey all,
> >
> > Just a reminder; Master and 4.1 are starting to diverge, this is not
> necessarily a bad thing at this time, but please make sure that any fixes you
> make for 4.1 are pushed into both trees.
> >
> > [spark@cloudstack-dev5 incubator-cloudstack]$ git status # On branch
> > 4.1 nothing to commit (working directory clean)
> > [spark@cloudstack-dev5 incubator-cloudstack]$ git diff --stat master
> > agent/test/com/cloud/agent/TestAgentShell.java | 2 +-
> > .../cloud/exception/PermissionDeniedException.java | 4 +
> > .../com/cloud/exception/RequestLimitException.java | 3 +-
> > api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +-
> > docs/en-US/Admin_Guide.xml | 2 +-
> > docs/en-US/Book_Info.xml | 2 +-
> > docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 5 +-
> > docs/en-US/Developers_Guide.xml | 2 +-
> > docs/en-US/Installation_Guide.xml | 2 +-
> > .../change-network-offering-on-guest-network.xml | 4 +-
> > docs/en-US/creating-network-offerings.xml | 2 +-
> > docs/en-US/hypervisor-host-install-libvirt.xml | 12 +-
> > docs/en-US/prepare-system-vm-template.xml | 29 +-
> > docs/en-US/security-groups.xml | 2 +-
> > ...pgrade-virtual-router-with-service-offering.xml | 3 +-
> > packaging/centos63/cloud.spec | 3 +-
> > .../ratelimit/ApiRateLimitServiceImpl.java | 2 +-
> > .../networkservice/AddBaremetalDhcpCmd.java | 3 +-
> > .../AddBaremetalKickStartPxeCmd.java | 3 +-
> > .../networkservice/AddBaremetalPxeCmd.java | 2 +-
> > .../networkservice/BaremetalDhcpResponse.java | 4 +
> > .../BaremetalPxeKickStartResponse.java | 5 +-
> > .../networkservice/BaremetalPxePingResponse.java | 4 +-
> > .../networkservice/ListBaremetalDhcpCmd.java | 3 +-
> > .../ListBaremetalPxePingServersCmd.java | 3 +-
> > .../kvm/resource/LibvirtComputingResource.java | 149 +++-
> > scripts/storage/secondary/cloud-install-sys-tmplt | 16 +-
> > scripts/vm/hypervisor/xenserver/vmops | 1 -
> > server/src/com/cloud/api/ApiServer.java | 20 +-
> > .../src/com/cloud/network/NetworkManagerImpl.java | 13 +-
> > server/src/com/cloud/vm/UserVmManagerImpl.java | 31 +-
> > tools/apidoc/generateadmincommands.xsl | 2 +-
> > tools/apidoc/generatedomainadmincommands.xsl | 2 +-
> > tools/apidoc/generatetoc_header.xsl | 2 +-
> > tools/apidoc/generateusercommands.xsl | 2 +-
> > .../appliance/definitions/systemvmtemplate/LICENSE | 21 -
> > .../appliance/definitions/systemvmtemplate/base.sh | 45 -
> > .../definitions/systemvmtemplate/cleanup.sh | 37 -
> > .../systemvmtemplate/cloudstack-packages.sh | 151 ----
> > .../definitions/systemvmtemplate/config.dat | 878 --------------------
> > .../definitions/systemvmtemplate/definition.rb | 6 +-
> > .../definitions/systemvmtemplate/postinstall.sh | 46 +-
> > .../definitions/systemvmtemplate/preseed.cfg | 16 +-
> > .../definitions/systemvmtemplate/zerodisk.sh | 23 -
> > .../cloud/utils/component/ComponentContext.java | 7 +-
> > 45 files changed, 264 insertions(+), 1313 deletions(-)
> >
> > Cheers,
> >
> > Hugo