incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Hugo Trippaers <HTrippa...@schubergphilis.com>
Subject RE: git commit: refs/heads/4.1 - CLOUDSTACK-1469 Commit 2f135be1 introduced jna as a dependency for hypervisor kvm, so make sure the version from the operating system is not used anymore (cherry picked from commit 6223520efd000b759da1b58586e9982761ffcd66)
Date Mon, 04 Mar 2013 11:20:16 GMT
Hey Chip,

Of course! Will stick to the agreed process from now on :-)

Cheers,

Hugo

> -----Original Message-----
> From: Chip Childers [mailto:chip.childers@sungard.com]
> Sent: vrijdag 1 maart 2013 15:07
> To: <cloudstack-dev@incubator.apache.org>
> Subject: Re: git commit: refs/heads/4.1 - CLOUDSTACK-1469 Commit
> 2f135be1 introduced jna as a dependency for hypervisor kvm, so make sure
> the version from the operating system is not used anymore (cherry picked
> from commit 6223520efd000b759da1b58586e9982761ffcd66)
> 
> Hey Hugo,
> 
> Looking at this commit, it seems reasonable. However, can we follow the
> process I proposed for getting changes into the 4.1 branch?
> 
> On Mar 1, 2013, at 9:04 AM, "hugo@apache.org" <hugo@apache.org> wrote:
> 
> > Updated Branches:
> >  refs/heads/4.1 d09a1cafd -> 53e58f050
> >
> >
> > CLOUDSTACK-1469 Commit 2f135be1 introduced jna as a dependency for
> > hypervisor kvm, so make sure the version from the operating system is
> > not used anymore (cherry picked from commit
> > 6223520efd000b759da1b58586e9982761ffcd66)
> >
> > Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
> >
> >
> > Project:
> > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
> > Commit:
> > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/53e
> > 58f05
> > Tree:
> > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/53e58
> > f05
> > Diff:
> > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/53e58
> > f05
> >
> > Branch: refs/heads/4.1
> > Commit: 53e58f050106725d083b71d2597ca2f3f2fa10fa
> > Parents: d09a1ca
> > Author: Hugo Trippaers <htrippaers@schubergphilis.com>
> > Authored: Fri Mar 1 14:54:11 2013 +0100
> > Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
> > Committed: Fri Mar 1 14:58:04 2013 +0100
> >
> > ----------------------------------------------------------------------
> > packaging/centos63/cloud-agent.rc |    2 +-
> > packaging/centos63/cloud.spec     |    1 -
> > 2 files changed, 1 insertions(+), 2 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53e58
> > f05/packaging/centos63/cloud-agent.rc
> > ----------------------------------------------------------------------
> > diff --git a/packaging/centos63/cloud-agent.rc
> > b/packaging/centos63/cloud-agent.rc
> > index d885dad..152e61e 100755
> > --- a/packaging/centos63/cloud-agent.rc
> > +++ b/packaging/centos63/cloud-agent.rc
> > @@ -59,7 +59,7 @@ export JAVA_HOME
> > SCP=""
> > DCP=""
> > ACP=`ls
> > /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls
> /usr/share/cloudstack-agent/lib/* | tr '\n' ':'` -
> JCP="/usr/share/java/jna.jar:/usr/share/java/commons-daemon.jar"
> > +JCP="/usr/share/java/commons-daemon.jar"
> >
> > # We need to append the JSVC daemon JAR to the classpath # AgentShell
> > implements the JSVC daemon methods
> >
> > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53e58
> > f05/packaging/centos63/cloud.spec
> > ----------------------------------------------------------------------
> > diff --git a/packaging/centos63/cloud.spec
> > b/packaging/centos63/cloud.spec index e7f1c31..3289c9a 100644
> > --- a/packaging/centos63/cloud.spec
> > +++ b/packaging/centos63/cloud.spec
> > @@ -113,7 +113,6 @@ Requires: libvirt
> > Requires: bridge-utils
> > Requires: ebtables
> > Requires: jsvc
> > -Requires: jna
> > Requires: jakarta-commons-daemon
> > Requires: jakarta-commons-daemon-jsvc
> > Provides: cloud-agent
> >
> >

Mime
View raw message