[asterixdb] 06/06: Merge commit 'fab68d291e' from 'stabilization-f69489'

[dl...@apache.org]

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

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

commit 019f6fea1e81915375e3f076ae82729c11505407
Merge: 393215e fab68d2
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Apr 12 18:05:32 2019 -0400

    Merge commit 'fab68d291e' from 'stabilization-f69489'
    
    Change-Id: Idcabca9b2b126f891a12e60e4b427fdc4828f07f

 .../dataflow/CheckpointInSecondaryIndexTest.java   | 460 ++++++++++-----------
 .../common/cluster/IClusterStateManager.java       |  10 +
 .../asterix/common/storage/IndexCheckpoint.java    |  11 +-
 .../asterix/runtime/utils/ClusterStateManager.java |  12 +
 .../main/opt/local/bin/start-sample-cluster.bat    |  21 +-
 .../src/main/opt/local/bin/start-sample-cluster.sh |  24 +-
 .../src/main/opt/local/bin/stop-sample-cluster.sh  |   2 +-
 .../org/apache/hyracks/api/util/StopWatch.java     |  19 +-
 8 files changed, 274 insertions(+), 285 deletions(-)

diff --cc asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
index 8f40b3a,bb9c10e..3da845d
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/CheckpointInSecondaryIndexTest.java
@@@ -79,7 -80,11 +80,9 @@@ import org.junit.AfterClass
  import org.junit.Assert;
  import org.junit.Before;
  import org.junit.BeforeClass;
+ import org.junit.Rule;
  import org.junit.Test;
+ import org.junit.rules.TestRule;
 -import org.junit.rules.TestWatcher;
 -import org.junit.runner.Description;
  import org.junit.runners.Parameterized;
  
  public class CheckpointInSecondaryIndexTest {