jasig-ssp IRC Logs-2013-07-30
[12:48:28 CDT(-0500)] <pspaude1> Sorry for the duplicate Dan, didn't see Tony had comitted this morning, I thought it was last night.
[12:48:41 CDT(-0500)] <dmccallum54> np
[12:48:43 CDT(-0500)] <pspaude1> I'll rebuild test and close it if its not present
[12:48:50 CDT(-0500)] <dmccallum54> not sure it's actually a duplicate
[12:49:04 CDT(-0500)] <dmccallum54> but if you hadnt tested on a very recent master, was probably worth testing again
[12:49:53 CDT(-0500)] <dmccallum54> i was going to wait on merging master into rel-2-0-patches again until after you were happy with the journal tool changes, but if it's too painful to get a master build up locally I can merge now to pick up tony's change and deploy it to Linux CI
[12:50:00 CDT(-0500)] <pspaude1> Yeah my local is setup and now CI is setup for it, so it can be tested easily.
[12:50:53 CDT(-0500)] <pspaude1> No my local is already at master and merged, just not rebuilt (stupid Windows NTFS) yes I know the mac store is down the road
[12:51:16 CDT(-0500)] <pspaude1>
[13:03:21 CDT(-0500)] <pspaude1> Oh, and I forgot, I closed SSP-1529 earlier this morning, the Journal tool is working great!
[13:03:46 CDT(-0500)] <dmccallum54> i didnt see those commits moved over to master. want me to do that now?
[13:04:00 CDT(-0500)] <dmccallum54> i do love a good rebase-and-squash
[13:04:19 CDT(-0500)] <pspaude1> Yeah, I thought you wanted to do that, since you love it so much.
[13:04:37 CDT(-0500)] * dmccallum54 cracking git knuckles
[13:05:02 CDT(-0500)] <pspaude1> popping antacids
[13:06:26 CDT(-0500)] <dmccallum54> pushed to master
[13:06:36 CDT(-0500)] <dmccallum54> deleting SSP-1529 remote branch
[13:07:31 CDT(-0500)] <pspaude1> Did you push your fix too, I only see my original
[13:07:43 CDT(-0500)] <dmccallum54> sqaushed everything into one commit
[13:08:04 CDT(-0500)] <pspaude1> Ah, yep see it now, too many changes to look through!
[14:53:40 CDT(-0500)] <pspaude1> SSP-1570 was similar to those two but a touch different. Either way it is fixed by those two issues (SSP-978 and SSP-536). Everything looks good and its working quite nice now. I closed SSP-1570.