dblock/waffle — pull request #4 by hazendaz (2012-07-07 04:14:28+00:00)
Title: Spring 3.1.1

Here is Spring updated to 3.1.1. Both the ANT test and JUNIT tests work as expected which exception of 4 tests I previously mentioned failing on my machine. I did a fresh pull which this time showed from the actual master not my copy of the master. The changes showed only the actual changes I was making prior to committing. After committing, it looks like it changed again on formatting. Based on the fact that I edited some files using notepad and the rest in eclipse, I don't think eclipse is causing the issue but rather the commit process. I'm using the git hub GUI. I closely verified every file prior to hitting commit. They all looked correct. As soon as the commit was completed, they looked different. At the moment, I'm unsure how to get around this other than going to the command prompt method for git hub. It seems to be the GUI is sort of problematic. Anyway, this batch is much smaller in actual code so should be easier to merge than the last.