[asterixdb] 05/06: Merge branch 'stabilization-f69489' into 'mad-hatter'

[mb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 5f0420937a7b7afeaa1536a2aca286677be7e1d4
Merge: b079ed0 91e18a7
Author: Murtadha Hubail <mh...@apache.org>
AuthorDate: Tue Oct 29 01:02:02 2019 +0300

    Merge branch 'stabilization-f69489' into 'mad-hatter'
    
    Change-Id: I07cab31b76128dfa5cea9b49620b1c074b385c81

 .../java/org/apache/asterix/app/nc/IndexCheckpointManager.java   | 6 ++----
 .../management/resource/PersistentLocalResourceRepository.java   | 4 ++--
 .../management/service/recovery/AbstractCheckpointManager.java   | 8 ++++++--
 .../src/main/java/org/apache/hyracks/util/file/FileUtil.java     | 9 +++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java
index 420585a,54647f8..cbc4d94
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java
@@@ -18,7 -18,7 +18,6 @@@
   */
  package org.apache.asterix.app.nc;
  
--import java.io.BufferedWriter;
  import java.io.File;
  import java.io.FilenameFilter;
  import java.io.IOException;