cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chip Childers <chip.child...@sungard.com>
Subject Re: [ACS41] Outstanding Blockers - Please Read!
Date Wed, 22 May 2013 13:33:45 GMT
On Tue, May 21, 2013 at 11:40:07PM +0000, Prachi Damle wrote:
> Chip,
> I just resolved the ticket, please cherry-pick following  commit's from master to 4.1
branch.
> 
> 1) ee0a91d111349b981d5f97fa69c97c34d9f15268
> 2) dce42581710ce3613f4bf765d713fab9552747ca

Prachi,

These commits don't cherry-pick cleanly.  Can you provide a clean patch
please?

Here are the conflicts:

For ee0a91d111349b981d5f97fa69c97c34d9f15268:
#both modified:      server/src/com/cloud/deploy/FirstFitPlanner.java

For dce42581710ce3613f4bf765d713fab9552747ca:
#both modified:
engine/orchestration/src/org/apache/cloudstackudstack/engine/cloud/entity/api/db/VolumeReservationVO.java
#both modifiedfied:
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java


Mime
View raw message