...
[18:04:56 CDT(-0500)] <dmccallum54> is it reasonable to assume that the current state of that test class in master is correct? i.e. i can just discard the inbound diff from rel-1-2 and go with what's already in master?
[18:05:16 CDT(-0500)] <dmccallum54> looks like that patch was nearly a wholesale replacement
[18:05:17 CDT(-0500)] <js70> yes.
[18:05:21 CDT(-0500)] <dmccallum54> ok cool
[18:05:22 CDT(-0500)] <dmccallum54> thx