Merge branch 'master' into notebook-search

bzz · bzz · commit 6da1dc9796d9 · 2015-12-19T00:37:43.000+09:00
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
@@ -81,7 +81,10 @@ public void setUp() throws Exception {
 
   @After
   public void tearDown() throws Exception {
-    FileUtils.deleteDirectory(mainZepDir);
+    //FileUtils.deleteDirectory(mainZepDir);
+    if (!FileUtils.deleteQuietly(mainZepDir)) {
+      logger.error("Failed to delete {} ", mainZepDir.getName());
+    }
   }
 
   @Test
