From mboxrd@z Thu Jan 1 00:00:00 1970 From: bwalton@artsci.utoronto.ca (Ben Walton) Date: Thu, 28 May 2009 11:31:36 -0400 Subject: [sup-talk] merge activity report In-Reply-To: <1243523591-sup-5117@entry> References: <1242659511-sup-4534@entry> <1242667096-sup-7844@ntdws12.chass.utoronto.ca> <1243523591-sup-5117@entry> Message-ID: <1243524514-sup-7560@ntdws12.chass.utoronto.ca> Excerpts from William Morgan's message of Thu May 28 11:13:56 -0400 2009: > Sorry for the delay on this. I've merged down everything related so a > rebase against master should be pretty easy for you. Once that's done > I will merge it into next. No problem. I'd actually rebased against master last night as I'd seen a flurry of activity on the gitorious rss feed. I did this again just now and force-pushed my changes to git://code.chass.utoronto.ca/bwalton-sup.git. [I note this for anyone that may have pulled from my branch previously...rebasing isn't a nice thing to do with published branches :) ] It's the bw/flexible_sent branch available from that URL. I haven't spent any time on the LockManager stuff in the last week+ though, as the NBA finals have been sapping up my evenings! Does this rebased branch meet your needs? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: not available URL: