svn commit: r1589004 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls: utils/TestSLSUtils.java web/TestSLSWebApp.java

[cnauroth]

Author: cnauroth
Date: Mon Apr 21 23:39:16 2014
New Revision: 1589004

URL: http://svn.apache.org/r1589004
Log:
YARN-1970. Merging change r1589001 from trunk to branch-2.

Modified:
    
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
    
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java

Modified: 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java?rev=1589004&r1=1589003&r2=1589004&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
 Mon Apr 21 23:39:16 2014
@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.yarn.sls.utils;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestSLSUtils {

Modified: 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java?rev=1589004&r1=1589003&r2=1589004&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
 Mon Apr 21 23:39:16 2014
@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.yarn.sls.web;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.yarn.sls.SLSRunner;
 import org.junit.Test;