Merge branch '1.1.x'

This commit is contained in:
Phillip Webb 2014-10-06 11:07:28 -07:00
commit 09d5812c3b

View File

@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
*
* @author Dave Syer
*/
public class SampleIntegrationApplicationTests {
public class SampleIntegrationParentApplicationTests {
private static ConfigurableApplicationContext context;