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: Build failed in Jenkins: build-docs-admin-master #1721
Date Mon, 13 May 2013 18:40:41 GMT
On Mon, May 13, 2013 at 06:28:09PM +0000, Nitin Mehta wrote:
> 
> 
> On 13/05/13 11:52 PM, "Chip Childers" <chip.childers@sungard.com> wrote:
> 
> >On Mon, May 13, 2013 at 06:13:46PM +0000, Nitin Mehta wrote:
> >> From link below the command "mvn -P developer -pl :cloud-apidoc" works
> >> fine without even putting any fix for the gslb.xml
> >> 
> >>https://cwiki.apache.org/CLOUDSTACK/how-to-generate-cloudstack-api-docume
> >>nt
> >> ation.html
> >
> >This is the admin guide, not the api docs.
> 
> Got it Chip. But I guess there must still be a way to build it right ?
> 
> >
> >> 
> >> 
> >> How do I verify my fix ?
> >
> >I suspect that you simply have a merge conflict that was committed in
> >the file.  Just review the file in question for "<<<" and work out the
> >right version to keep (normal conflict resolution).
> 
> I did that and wanted to verify it, but anyways I have pushed my changes
> removing the conflict messages like "<<<<<< HEAD" etc.

Build instructions within this page:

https://cwiki.apache.org/confluence/display/CLOUDSTACK/Releasing+Docs

Mime
View raw message