ummm....i branched 4.1.8 when i did the swift branch (?)<br><br><div class="gmail_quote">On Thu, Jan 6, 2011 at 10:50 AM, Mihael Hategan <span dir="ltr"><<a href="mailto:hategan@mcs.anl.gov">hategan@mcs.anl.gov</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">I also branched cog to 4.1.8. Skenny, you should probably have write<br>
access to the cog svn.<br>
<div><div></div><div class="h5"><br>
On Mon, 2011-01-03 at 21:45 -0800, Sarah Kenny wrote:<br>
> alrighty...branching done :)<br>
><br>
> On Mon, Jan 3, 2011 at 9:18 PM, Mihael Hategan <<a href="mailto:hategan@mcs.anl.gov">hategan@mcs.anl.gov</a>><br>
> wrote:<br>
> Sorry about that. Swift trunk/r3837.<br>
><br>
><br>
> On Mon, 2011-01-03 at 21:09 -0800, Sarah Kenny wrote:<br>
> > still getting some complaints from the compiler on the<br>
> merged files:<br>
> ><br>
> > compile:<br>
> > [echo] [swift]: COMPILE<br>
> > [javac] Compiling 374 source files<br>
> > to /home/skenny/builds/cog/modules/swift/build<br>
> ><br>
> ><br>
> [javac] /home/skenny/builds/cog/modules/swift/src/org/griphyn/vdl/mapping/AbstractDataNode.java:557: closeArraySizes() is already defined in org.griphyn.vdl.mapping.AbstractDataNode<br>
> > [javac] public void closeArraySizes() {<br>
> > [javac] ^<br>
> > [javac] Note: Some input files use unchecked or unsafe<br>
> operations.<br>
> > [javac] Note: Recompile with -Xlint:unchecked for<br>
> details.<br>
> > [javac] 1 error<br>
> ><br>
> > BUILD FAILED<br>
> ><br>
> ><br>
> > On Mon, Jan 3, 2011 at 1:37 PM, Mihael Hategan<br>
> <<a href="mailto:hategan@mcs.anl.gov">hategan@mcs.anl.gov</a>><br>
> > wrote:<br>
> > Should be fixed in cog trunk/2990.<br>
> ><br>
> ><br>
> > On Mon, 2011-01-03 at 04:35 -0600, Mihael Hategan<br>
> wrote:<br>
> > > I'll fix that tomorrow. Actually that's later<br>
> today.<br>
> > ><br>
> > > Mihael<br>
> > ><br>
> > > On Sun, 2011-01-02 at 20:23 -0800, Sarah Kenny<br>
> wrote:<br>
> > > > sorry, forgot where we landed on the naming...as<br>
> long as<br>
> > it's<br>
> > > > somewhere btwn .91 and 1.0 we should be all<br>
> right :) but<br>
> > yeah, i can<br>
> > > > branch the release as .92. however, i just<br>
> checked out<br>
> > trunk and am<br>
> > > > getting some errors compiling:<br>
> > > ><br>
> > > > compile:<br>
> > > > [echo] [provider-coaster]: COMPILE<br>
> > > > [javac] Compiling 124 source files<br>
> > > ><br>
> to /home/skenny/builds/cog/modules/provider-coaster/build<br>
> > > ><br>
> > > ><br>
> ><br>
> [javac] /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242: illegal start of type<br>
> > > > [javac] if (shutdown) {<br>
> > > > [javac] ^<br>
> > > ><br>
> > > ><br>
> ><br>
> [javac] /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242: ';' expected<br>
> > > > [javac] if (shutdown) {<br>
> > > > [javac] ^<br>
> > > ><br>
> > > ><br>
> ><br>
> [javac] /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242: not a statement<br>
> > > > [javac] if (shutdown) {<br>
> > > > [javac] ^<br>
> > > ><br>
> > > ><br>
> ><br>
> [javac] /home/skenny/builds/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Cpu.java:242: ';' expected<br>
> > > > [javac] if (shutdown) {<br>
> > > > [javac] ^<br>
> > > > [javac] 4 errors<br>
> > > ><br>
> > > ><br>
> > > > p.s. happy new year to you too!<br>
> > > ><br>
> > > ><br>
> > > ><br>
> > > > On Sun, Jan 2, 2011 at 5:20 PM, Michael Wilde<br>
> > <<a href="mailto:wilde@mcs.anl.gov">wilde@mcs.anl.gov</a>><br>
> > > > wrote:<br>
> > > > Indeed - that was the "great" part :)<br>
> > > > I was just asking so we that we get the<br>
> release<br>
> > number right<br>
> > > > when we create the release branch.<br>
> > > ><br>
> > > > - Mike<br>
> > > ><br>
> > > ><br>
> > > ><br>
> > > > ----- Original Message -----<br>
> > > > > On Sun, 2011-01-02 at 16:46 -0600,<br>
> Michael Wilde<br>
> > wrote:<br>
> > > > > > Happy New Year, All!<br>
> > > > ><br>
> > > > > And to you, too!<br>
> > > > > ><br>
> > > > > > This sounds great, but wasn't the<br>
> plan to call<br>
> > the current<br>
> > > > stable<br>
> > > > > > branch 0.91 and the current trunk<br>
> 0.92?<br>
> > > > ><br>
> > > > > Irrespective of that, bug fixes from<br>
> the branch<br>
> > should be<br>
> > > > merged to<br>
> > > > > trunk. And better to do so before<br>
> trunk is<br>
> > branched into<br>
> > > > another<br>
> > > > > release<br>
> > > > > branch.<br>
> > > > ><br>
> > > > > Mihael<br>
> > > ><br>
> > > ><br>
> > > ><br>
> > > > --<br>
> > > > Michael Wilde<br>
> > > > Computation Institute, University of<br>
> Chicago<br>
> > > > Mathematics and Computer Science<br>
> Division<br>
> > > > Argonne National Laboratory<br>
> > > ><br>
> > > ><br>
> > > ><br>
> > ><br>
> > ><br>
> ><br>
> ><br>
> > > _______________________________________________<br>
> > > Swift-devel mailing list<br>
> > > <a href="mailto:Swift-devel@ci.uchicago.edu">Swift-devel@ci.uchicago.edu</a><br>
> > ><br>
> <a href="http://mail.ci.uchicago.edu/mailman/listinfo/swift-devel" target="_blank">http://mail.ci.uchicago.edu/mailman/listinfo/swift-devel</a><br>
> ><br>
> ><br>
> ><br>
> ><br>
><br>
><br>
><br>
><br>
<br>
<br>
</div></div></blockquote></div><br>