cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Nitin Mehta" <nitin.me...@citrix.com>
Subject Re: Review Request 13188: CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools in the template
Date Thu, 01 Aug 2013 06:48:21 GMT


> On Aug. 1, 2013, 6:42 a.m., Nitin Mehta wrote:
> > server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java, line 581
> > <https://reviews.apache.org/r/13188/diff/1/?file=332299#file332299line581>
> >
> >     Ideally we should make it part of the constructor.

On master you need to resolve the conflicts

# On branch master
# Changes to be committed:
#
#	modified:   server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
#	both modified:      server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
#
Nitins-MacBook-Air:cloudstack nitinmehta$ 
Nitins-MacBook-Air:cloudstack nitinmehta$ git reset --hard
HEAD is now at 8672e0f - CLOUDSTACK-3229: Removes String format method call that is not
Nitins-MacBook-Air:cloudstack nitinmehta$ git status
# On branch master
nothing to commit (working directory clean)
Nitins-MacBook-Air:cloudstack nitinmehta$ git cherry-pick 381318928348289f5dacd9d482302a9be561f6bd
error: could not apply 3813189... CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU
based on the presence of tools in the template
hint: after resolving the conflicts, mark the corrected paths


- Nitin


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/13188/#review24418
-----------------------------------------------------------


On Aug. 1, 2013, 6:35 a.m., Harikrishna Patnala wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/13188/
> -----------------------------------------------------------
> 
> (Updated Aug. 1, 2013, 6:35 a.m.)
> 
> 
> Review request for cloudstack and Nitin Mehta.
> 
> 
> Bugs: CLOUDSTACK-3042
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> -------
> 
> CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools
in the template
> 
> 
> Diffs
> -----
> 
>   server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 5983aa7 
>   server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 3ee8a1c

>   server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java 6859b0b 
> 
> Diff: https://reviews.apache.org/r/13188/diff/
> 
> 
> Testing
> -------
> 
> Tested locally
> 
> 
> Thanks,
> 
> Harikrishna Patnala
> 
>


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message