On Tue, Mar 12, 2013 at 05:25:21PM +0530, Wido den Hollander wrote: > Hi, > > In the last meeting my #action was to merge the Debian packaging commits > from master into 4.1, but I didn't get around doing so. > > I found some more time to test it all and it seems the packages are > working pretty well. > > The package I tested mainly was the agent package, but the others should > work as well. > > Now, my problem is the cherry-picking, since I didn't do that so often > I'm looking for the easiest way to find all my commits (and from others) > so those can be cherry-picked into 4.1. > > What's the easiest way to do this? > > Wido
Hey Wido, The commit 8d333ec6648ae6e114309da4b497ef74a1c47912 caused an issue with cloudstack-agents (CLOUDSTACK-1469) to resurface last week after the merge to 4.1. The dependency JNA was added to help the agent to start successfully in rpm artifacts. Can we just include the jna dependency back in the pom? I've reopened the bug and assigned it to you. diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 0639f20..62536dc 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -43,11 +43,6 @@ <artifactId>libvirt</artifactId> <version>${cs.libvirt-java.version}</version> </dependency> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>${cs.jna.version}</version> - </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> -- Prasanna.,