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: [MERGE] javelin is now merged into master - doc build conflicts
Date Sat, 02 Feb 2013 01:36:44 GMT
On Feb 1, 2013, at 8:28 PM, Kelven Yang <kelven.yang@citrix.com> wrote:

> For some reason, document conflicts did not appear in my git "merge
> conflicts", I resolved doc conflicts after the merge now.
>
> Jessica T, please double check if my resolution for these conflicts, I
> have little idea to verify the correctness of these document.
>
> Kelven
>
>

All set for the release branch now then? (We can fix issues obviously as we go)

Mime
View raw message