some of local changes in the pom files caused conflicts and were easy to
solve. Thanks for upgrading the versions.
~Rajani
On Mon, Dec 8, 2014 at 12:14 PM, Rohit Yadav
wrote:
> Hi Rajani,
>
>
> On Monday 08 December 2014 09:58 AM, Rajani Karuturi wrote:
>
>> merge conflicts :)
>>
>
> This commi
Hi Rajani,
On Monday 08 December 2014 09:58 AM, Rajani Karuturi wrote:
merge conflicts :)
This commit is already on master, thanks to you for the maven-war plugin
version suggestion.
Did you rebase over something, I'm sure you can fix them :)
~Rajani
On Thu, Dec 4, 2014 at 2:13 AM, wro
merge conflicts :)
~Rajani
On Thu, Dec 4, 2014 at 2:13 AM, wrote:
> Repository: cloudstack
> Updated Branches:
> refs/heads/master 8cb11f407 -> fac7bfc5d
>
>
> CLOUDSTACK-8011: Upgrade maven dependencies
>
> Changes;
> - Upgrades maven-war plugin to 4.5 (faster war packaging)
> - Upgrade spr
