flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [3/5] flink git commit: [FLINK-9121] [flip6] Remove Flip6 prefixes and other references
Date Mon, 02 Apr 2018 15:13:20 GMT
[FLINK-9121] [flip6] Remove Flip6 prefixes and other references

Remove Flip6 prefixes and references to make Flip-6 the proper default:

Rename categories Flip6 -> New and OldAndFlip6 -> LegacyAndNew

Remove Flip-6 from documentation

Remove Flip-6 from start up scripts

This closes #5801.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/af5279e9
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/af5279e9
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/af5279e9

Branch: refs/heads/master
Commit: af5279e9bd3dec18512a54c59982e3dc1f253cd2
Parents: 3d37178
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Mon Apr 2 11:13:57 2018 +0200
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Mon Apr 2 16:59:40 2018 +0200

----------------------------------------------------------------------
 .travis.yml                                     |  10 +-
 docs/monitoring/rest_api.md                     |   4 -
 docs/ops/config.md                              |  10 +-
 docs/ops/state/large_state_tuning.md            |   4 +-
 .../org/apache/flink/client/LocalExecutor.java  |   2 +-
 .../org/apache/flink/client/RemoteExecutor.java |   2 +-
 .../apache/flink/client/cli/CliFrontend.java    |  12 +-
 .../org/apache/flink/client/cli/DefaultCLI.java |   9 +-
 .../flink/client/cli/Flip6DefaultCLI.java       |  74 -------------
 .../org/apache/flink/client/cli/LegacyCLI.java  |  69 ++++++++++++
 .../Flip6StandaloneClusterDescriptor.java       |  77 -------------
 .../LegacyStandaloneClusterDescriptor.java      |  76 +++++++++++++
 .../deployment/StandaloneClusterDescriptor.java |  21 ++--
 .../cli/CliFrontendPackageProgramTest.java      |   2 +-
 .../flink/client/cli/CliFrontendTestBase.java   |  10 +-
 .../apache/flink/client/cli/DefaultCLITest.java |   2 +-
 .../program/rest/RestClusterClientTest.java     |   4 +-
 .../apache/flink/configuration/CoreOptions.java |  16 +--
 flink-dist/src/main/flink-bin/bin/config.sh     |   2 +-
 flink-dist/src/main/flink-bin/bin/jobmanager.sh |   2 +-
 .../src/main/flink-bin/bin/start-cluster.sh     |   2 +-
 .../src/main/flink-bin/bin/stop-cluster.sh      |  10 +-
 .../src/main/flink-bin/bin/taskmanager.sh       |   2 +-
 .../main/flink-bin/mesos-bin/mesos-appmaster.sh |   2 +-
 .../flink-bin/mesos-bin/mesos-taskmanager.sh    |   2 +-
 flink-docs/pom.xml                              |   2 +-
 .../client/gateway/local/DependencyTest.java    |   4 +-
 .../environment/PythonEnvironmentFactory.java   |   3 +-
 .../client/proxy/KvStateClientProxyImpl.java    |   2 +-
 .../proxy/KvStateClientProxyImplTest.java       |   2 +-
 .../HighAvailabilityServices.java               |   6 +-
 .../flink/runtime/instance/SharedSlot.java      |   2 +-
 .../flink/runtime/instance/SimpleSlot.java      |   2 +-
 .../org/apache/flink/runtime/instance/Slot.java |   4 +-
 .../scheduler/CoLocationConstraint.java         |   3 +-
 .../flink/runtime/minicluster/MiniCluster.java  |   6 +-
 .../flink/runtime/query/KvStateRegistry.java    |   2 +-
 .../flink/runtime/taskmanager/TaskManager.scala |   2 +-
 .../runtime/dispatcher/DispatcherTest.java      |   4 +-
 .../FileArchivedExecutionGraphStoreTest.java    |   4 +-
 .../runtime/dispatcher/MiniDispatcherTest.java  |   4 +-
 .../runtime/heartbeat/HeartbeatManagerTest.java |   4 +-
 .../standalone/StandaloneHaServicesTest.java    |   2 +-
 .../scheduler/SchedulerSlotSharingTest.java     |   2 +-
 .../flink/runtime/jobmaster/JobMasterTest.java  |   4 +-
 .../flink/runtime/jobmaster/JobResultTest.java  |   4 +-
 .../jobmaster/slotpool/AllocatedSlotsTest.java  |   4 +-
 .../jobmaster/slotpool/AvailableSlotsTest.java  |   4 +-
 .../jobmaster/slotpool/DualKeyMapTest.java      |   4 +-
 .../jobmaster/slotpool/SlotPoolRpcTest.java     |   4 +-
 .../slotpool/SlotPoolSchedulingTestBase.java    |   4 +-
 .../jobmaster/slotpool/SlotPoolTest.java        |   4 +-
 .../slotpool/SlotSharingManagerTest.java        |   4 +-
 .../runtime/minicluster/MiniClusterITCase.java  |   4 +-
 .../runtime/query/KvStateRegistryTest.java      |   2 +-
 .../resourcemanager/JobLeaderIdServiceTest.java |   4 +-
 .../resourcemanager/ResourceManagerHATest.java  |   4 +-
 .../ResourceManagerJobMasterTest.java           |   4 +-
 .../ResourceManagerTaskExecutorTest.java        |   4 +-
 .../resourcemanager/ResourceManagerTest.java    |   4 +-
 .../slotmanager/SlotManagerTest.java            |   4 +-
 .../slotmanager/SlotProtocolTest.java           |   4 +-
 .../runtime/rest/RestServerEndpointITCase.java  |   4 +-
 .../runtime/rest/RestServerEndpointTest.java    |   4 +-
 .../handler/job/BlobServerPortHandlerTest.java  |   4 +-
 .../job/JobExecutionResultHandlerTest.java      |   4 +-
 .../rest/handler/job/JobSubmitHandlerTest.java  |   4 +-
 .../job/metrics/AbstractMetricsHandlerTest.java |   4 +-
 .../job/metrics/MetricsHandlerTestBase.java     |   4 +-
 .../rest/messages/MessageParametersTest.java    |   4 +-
 .../RestRequestMarshallingTestBase.java         |   4 +-
 .../RestResponseMarshallingTestBase.java        |   4 +-
 .../job/metrics/AbstractMetricsHeadersTest.java |   4 +-
 .../metrics/JobManagerMetricsHeadersTest.java   |   4 +-
 .../job/metrics/JobMetricsHeadersTest.java      |   4 +-
 .../metrics/JobVertexMetricsHeadersTest.java    |   4 +-
 .../job/metrics/MetricsFilterParameterTest.java |   4 +-
 .../job/metrics/SubtaskMetricsHeadersTest.java  |   4 +-
 .../metrics/TaskManagerMetricsHeadersTest.java  |   4 +-
 .../TaskManagerIdPathParameterTest.java         |   4 +-
 .../flink/runtime/rpc/AsyncCallsTest.java       |   4 +-
 .../runtime/rpc/FencedRpcEndpointTest.java      |   4 +-
 .../flink/runtime/rpc/RpcConnectionTest.java    |   4 +-
 .../flink/runtime/rpc/RpcEndpointTest.java      |   4 +-
 .../runtime/rpc/akka/AkkaRpcActorTest.java      |   4 +-
 .../runtime/rpc/akka/AkkaRpcServiceTest.java    |   4 +-
 .../rpc/akka/MainThreadValidationTest.java      |   4 +-
 .../rpc/akka/MessageSerializationTest.java      |   4 +-
 .../NetworkBufferCalculationTest.java           |   4 +-
 .../taskexecutor/TaskExecutorITCase.java        |   4 +-
 .../runtime/taskexecutor/TaskExecutorTest.java  |   4 +-
 .../TaskManagerServicesConfigurationTest.java   |   4 +-
 .../taskexecutor/TaskManagerServicesTest.java   |   4 +-
 .../TestingTaskExecutorGateway.java             |   4 +-
 .../taskexecutor/slot/TimerServiceTest.java     |   4 +-
 .../TaskCancelAsyncProducerConsumerITCase.java  |   4 +-
 .../flink/api/scala/ScalaShellITCase.scala      |   2 +-
 .../scala/ScalaShellLocalStartupITCase.scala    |   2 +-
 .../Flip6LocalStreamEnvironment.java            | 111 -------------------
 .../LegacyLocalStreamEnvironment.java           | 101 +++++++++++++++++
 .../api/environment/LocalStreamEnvironment.java |  57 ++++++----
 .../environment/RemoteStreamEnvironment.java    |   2 +-
 .../environment/StreamExecutionEnvironment.java |   6 +-
 .../LocalStreamEnvironmentITCase.java           |   6 +-
 .../apache/flink/testutils/category/Flip6.java  |  25 -----
 .../flink/testutils/category/LegacyAndNew.java  |  26 +++++
 .../apache/flink/testutils/category/New.java    |  25 +++++
 .../flink/testutils/category/OldAndFlip6.java   |  25 -----
 .../flink/test/util/AbstractTestBase.java       |   4 +-
 .../flink/test/util/MiniClusterResource.java    |  22 ++--
 .../jobmaster/JobMasterTriggerSavepointIT.java  |   4 +-
 .../accumulators/AccumulatorLiveITCase.java     |   4 +-
 .../flink/test/misc/AutoParallelismITCase.java  |   2 +-
 .../test/operators/RemoteEnvironmentITCase.java |   4 +-
 ...agerHAProcessFailureBatchRecoveryITCase.java |   2 +-
 .../recovery/ProcessFailureCancelingITCase.java |   2 +-
 ...anagerProcessFailureBatchRecoveryITCase.java |   2 +-
 ...erProcessFailureStreamingRecoveryITCase.java |   2 +-
 .../AbstractOperatorRestoreTestBase.java        |   4 +-
 .../yarn/TestingYarnClusterDescriptor.java      |   2 +-
 .../flink/yarn/YARNHighAvailabilityITCase.java  |   2 +-
 .../java/org/apache/flink/yarn/YARNITCase.java  |   8 +-
 .../YARNSessionCapacitySchedulerITCase.java     |   4 +-
 .../flink/yarn/YARNSessionFIFOITCase.java       |   4 +-
 .../flink/yarn/YarnConfigurationITCase.java     |   2 +-
 .../org/apache/flink/yarn/YarnTestBase.java     |   8 +-
 .../yarn/AbstractYarnClusterDescriptor.java     |   2 +-
 .../flink/yarn/Flip6YarnClusterDescriptor.java  |  99 -----------------
 .../flink/yarn/LegacyYarnClusterDescriptor.java |  78 +++++++++++++
 .../flink/yarn/YarnClusterDescriptor.java       |  50 ++++++---
 .../flink/yarn/cli/FlinkYarnSessionCli.java     |  14 +--
 .../flink/yarn/YarnClusterDescriptorTest.java   |  16 +--
 pom.xml                                         |  12 +-
 133 files changed, 716 insertions(+), 717 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f86bbef..08aab30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,27 +39,27 @@ matrix:
     - jdk: "oraclejdk8"
       env:
         - TEST="core"
-        - PROFILE="-Dhadoop.version=2.8.3 -Dflip6"
+        - PROFILE="-Dhadoop.version=2.8.3 -Dnew"
         - CACHE_NAME=JDK8_H280_CO
     - jdk: "oraclejdk8"
       env:
         - TEST="libraries"
-        - PROFILE="-Dhadoop.version=2.8.3 -Dflip6"
+        - PROFILE="-Dhadoop.version=2.8.3 -Dnew"
         - CACHE_NAME=JDK8_H280_L
     - jdk: "oraclejdk8"
       env:
         - TEST="connectors"
-        - PROFILE="-Dhadoop.version=2.8.3 -Dflip6 -Pinclude-kinesis"
+        - PROFILE="-Dhadoop.version=2.8.3 -Dnew -Pinclude-kinesis"
         - CACHE_NAME=JDK8_H280_CN
     - jdk: "oraclejdk8"
       env:
         - TEST="tests"
-        - PROFILE="-Dhadoop.version=2.8.3 -Dflip6"
+        - PROFILE="-Dhadoop.version=2.8.3 -Dnew"
         - CACHE_NAME=JDK8_H280_T
     - jdk: "oraclejdk8"
       env:
         - TEST="misc"
-        - PROFILE="-Dhadoop.version=2.8.3 -Dflip6 -Dinclude_hadoop_aws"
+        - PROFILE="-Dhadoop.version=2.8.3 -Dnew -Dinclude_hadoop_aws"
         - CACHE_NAME=JDK8_H280_M
     - jdk: "openjdk8"
       env:

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/docs/monitoring/rest_api.md
----------------------------------------------------------------------
diff --git a/docs/monitoring/rest_api.md b/docs/monitoring/rest_api.md
index 410ba9c..c160ad0 100644
--- a/docs/monitoring/rest_api.md
+++ b/docs/monitoring/rest_api.md
@@ -674,10 +674,6 @@ Response:
 {"jobid": "869a9868d49c679e7355700e0857af85"}
 ~~~
 
-## FLIP-6
-
-The following is the REST API documentation for FLIP-6.
-
 ### Dispatcher
 
 {% include generated/rest_dispatcher.html %}

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/docs/ops/config.md
----------------------------------------------------------------------
diff --git a/docs/ops/config.md b/docs/ops/config.md
index ce5bc9b..d5d81f5 100644
--- a/docs/ops/config.md
+++ b/docs/ops/config.md
@@ -378,15 +378,15 @@ You have to configure `jobmanager.archive.fs.dir` in order to archive terminated
 
 {% include generated/history_server_configuration.html %}
 
-## Flip-6
+### Slot Manager
 
-- `mode`: Execution mode of Flink. Possible values are `old` and `flip6`. In order to start the Flip-6 components, you have to specify `flip6` (DEFAULT: `old`).
+The configuration keys in this section are relevant for the SlotManager running in the ResourceManager
 
-### Slot Manager (Flip-6)
+{% include generated/slot_manager_configuration.html %}
 
-The configuration keys in this section are relevant for the SlotManager running in the Flip-6 ResourceManager
+## Legacy
 
-{% include generated/slot_manager_configuration.html %}
+- `mode`: Execution mode of Flink. Possible values are `legacy` and `new`. In order to start the legacy components, you have to specify `legacy` (DEFAULT: `new`).
 
 ## Background
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/docs/ops/state/large_state_tuning.md
----------------------------------------------------------------------
diff --git a/docs/ops/state/large_state_tuning.md b/docs/ops/state/large_state_tuning.md
index d6cec6f..6359938 100644
--- a/docs/ops/state/large_state_tuning.md
+++ b/docs/ops/state/large_state_tuning.md
@@ -321,10 +321,12 @@ files also no additional disk space is consumed for task-local recovery with inc
 
 ### Allocation-preserving scheduling
 
-Task-local recovery assumes allocation-preserving task scheduling under failures, which was introduced as part of FLIP-6 and works as follows. Each task remembers its previous
+Task-local recovery assumes allocation-preserving task scheduling under failures, which works as follows. Each task remembers its previous
 allocation and *requests the exact same slot* to restart in recovery. If this slot is not available, the task will request a *new, fresh slot* from the resource manager. This way,
 if a task manager is no longer available, a task that cannot return to its previous location *will not drive other recovering tasks out of their previous slots*. Our reasoning is
 that the previous slot can only disappear when a task manager is no longer available, and in this case *some* tasks have to request a new slot anyways. With our scheduling strategy
 we give the maximum number of tasks a chance to recover from their local state and avoid the cascading effect of tasks stealing their previous slots from one another.
 
+Allocation-preserving scheduling does not work with Flink's legacy mode.
+
 {% top %}

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java b/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
index 415e33c..48855be 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
@@ -124,7 +124,7 @@ public class LocalExecutor extends PlanExecutor {
 
 	private JobExecutorService createJobExecutorService(Configuration configuration) throws Exception {
 		final JobExecutorService newJobExecutorService;
-		if (CoreOptions.FLIP6_MODE.equals(configuration.getString(CoreOptions.MODE))) {
+		if (CoreOptions.NEW_MODE.equals(configuration.getString(CoreOptions.MODE))) {
 
 			configuration.setInteger(RestOptions.REST_PORT, 0);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java b/flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java
index 1afa087..f6242e7 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java
@@ -151,7 +151,7 @@ public class RemoteExecutor extends PlanExecutor {
 	public void start() throws Exception {
 		synchronized (lock) {
 			if (client == null) {
-				if (CoreOptions.OLD_MODE.equals(clientConfiguration.getString(CoreOptions.MODE))) {
+				if (CoreOptions.LEGACY_MODE.equals(clientConfiguration.getString(CoreOptions.MODE))) {
 					client = new StandaloneClusterClient(clientConfiguration);
 				} else {
 					client = new RestClusterClient<>(clientConfiguration, "RemoteExecutor");

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
index a874891..ce6556b 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
@@ -119,7 +119,7 @@ public class CliFrontend {
 
 	private final int defaultParallelism;
 
-	private final boolean flip6;
+	private final boolean isNewMode;
 
 	public CliFrontend(
 			Configuration configuration,
@@ -144,7 +144,7 @@ public class CliFrontend {
 		this.clientTimeout = AkkaUtils.getClientTimeout(this.configuration);
 		this.defaultParallelism = configuration.getInteger(CoreOptions.DEFAULT_PARALLELISM);
 
-		this.flip6 = CoreOptions.FLIP6_MODE.equalsIgnoreCase(configuration.getString(CoreOptions.MODE));
+		this.isNewMode = CoreOptions.NEW_MODE.equalsIgnoreCase(configuration.getString(CoreOptions.MODE));
 	}
 
 	// --------------------------------------------------------------------------------------------
@@ -225,7 +225,7 @@ public class CliFrontend {
 			final ClusterClient<T> client;
 
 			// directly deploy the job if the cluster is started in job mode and detached
-			if (flip6 && clusterId == null && runOptions.getDetachedMode()) {
+			if (isNewMode && clusterId == null && runOptions.getDetachedMode()) {
 				int parallelism = runOptions.getParallelism() == -1 ? defaultParallelism : runOptions.getParallelism();
 
 				final JobGraph jobGraph = PackagedProgramUtils.createJobGraph(program, configuration, parallelism);
@@ -1162,10 +1162,10 @@ public class CliFrontend {
 			LOG.warn("Could not load CLI class {}.", flinkYarnSessionCLI, e);
 		}
 
-		if (configuration.getString(CoreOptions.MODE).equalsIgnoreCase(CoreOptions.FLIP6_MODE)) {
-			customCommandLines.add(new Flip6DefaultCLI(configuration));
-		} else {
+		if (configuration.getString(CoreOptions.MODE).equalsIgnoreCase(CoreOptions.NEW_MODE)) {
 			customCommandLines.add(new DefaultCLI(configuration));
+		} else {
+			customCommandLines.add(new LegacyCLI(configuration));
 		}
 
 		return customCommandLines;

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java b/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java
index 2ca5a65..43efc63 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java
@@ -25,6 +25,7 @@ import org.apache.flink.configuration.Configuration;
 import org.apache.flink.util.FlinkException;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
 
 import javax.annotation.Nullable;
 
@@ -39,13 +40,17 @@ public class DefaultCLI extends AbstractCustomCommandLine<StandaloneClusterId> {
 
 	@Override
 	public boolean isActive(CommandLine commandLine) {
-		// always active because we can try to read a JobManager address from the config
 		return true;
 	}
 
 	@Override
 	public String getId() {
-		return "Default CLI";
+		return "default";
+	}
+
+	@Override
+	public void addGeneralOptions(Options baseOptions) {
+		super.addGeneralOptions(baseOptions);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/cli/Flip6DefaultCLI.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/Flip6DefaultCLI.java b/flink-clients/src/main/java/org/apache/flink/client/cli/Flip6DefaultCLI.java
deleted file mode 100644
index 3ff1b3e..0000000
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/Flip6DefaultCLI.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.client.cli;
-
-import org.apache.flink.client.deployment.ClusterSpecification;
-import org.apache.flink.client.deployment.Flip6StandaloneClusterDescriptor;
-import org.apache.flink.client.deployment.StandaloneClusterId;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.util.FlinkException;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Options;
-
-import javax.annotation.Nullable;
-
-/**
- * The default CLI which is used for interaction with standalone clusters.
- */
-public class Flip6DefaultCLI extends AbstractCustomCommandLine<StandaloneClusterId> {
-
-	public Flip6DefaultCLI(Configuration configuration) {
-		super(configuration);
-	}
-
-	@Override
-	public boolean isActive(CommandLine commandLine) {
-		return true;
-	}
-
-	@Override
-	public String getId() {
-		return "flip6";
-	}
-
-	@Override
-	public void addGeneralOptions(Options baseOptions) {
-		super.addGeneralOptions(baseOptions);
-	}
-
-	@Override
-	public Flip6StandaloneClusterDescriptor createClusterDescriptor(
-			CommandLine commandLine) throws FlinkException {
-		final Configuration effectiveConfiguration = applyCommandLineOptionsToConfiguration(commandLine);
-
-		return new Flip6StandaloneClusterDescriptor(effectiveConfiguration);
-	}
-
-	@Override
-	@Nullable
-	public StandaloneClusterId getClusterId(CommandLine commandLine) {
-		return StandaloneClusterId.getInstance();
-	}
-
-	@Override
-	public ClusterSpecification getClusterSpecification(CommandLine commandLine) {
-		return new ClusterSpecification.ClusterSpecificationBuilder().createClusterSpecification();
-	}
-}

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/cli/LegacyCLI.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/LegacyCLI.java b/flink-clients/src/main/java/org/apache/flink/client/cli/LegacyCLI.java
new file mode 100644
index 0000000..761929d
--- /dev/null
+++ b/flink-clients/src/main/java/org/apache/flink/client/cli/LegacyCLI.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.client.cli;
+
+import org.apache.flink.client.deployment.ClusterSpecification;
+import org.apache.flink.client.deployment.LegacyStandaloneClusterDescriptor;
+import org.apache.flink.client.deployment.StandaloneClusterId;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.util.FlinkException;
+
+import org.apache.commons.cli.CommandLine;
+
+import javax.annotation.Nullable;
+
+/**
+ * The CLI which is used for interaction with the legacy standalone clusters.
+ */
+public class LegacyCLI extends AbstractCustomCommandLine<StandaloneClusterId> {
+
+	public LegacyCLI(Configuration configuration) {
+		super(configuration);
+	}
+
+	@Override
+	public boolean isActive(CommandLine commandLine) {
+		// always active because we can try to read a JobManager address from the config
+		return true;
+	}
+
+	@Override
+	public String getId() {
+		return "legacy";
+	}
+
+	@Override
+	public LegacyStandaloneClusterDescriptor createClusterDescriptor(
+			CommandLine commandLine) throws FlinkException {
+		final Configuration effectiveConfiguration = applyCommandLineOptionsToConfiguration(commandLine);
+
+		return new LegacyStandaloneClusterDescriptor(effectiveConfiguration);
+	}
+
+	@Override
+	@Nullable
+	public StandaloneClusterId getClusterId(CommandLine commandLine) {
+		return StandaloneClusterId.getInstance();
+	}
+
+	@Override
+	public ClusterSpecification getClusterSpecification(CommandLine commandLine) {
+		return new ClusterSpecification.ClusterSpecificationBuilder().createClusterSpecification();
+	}
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/deployment/Flip6StandaloneClusterDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/deployment/Flip6StandaloneClusterDescriptor.java b/flink-clients/src/main/java/org/apache/flink/client/deployment/Flip6StandaloneClusterDescriptor.java
deleted file mode 100644
index 0a3286a..0000000
--- a/flink-clients/src/main/java/org/apache/flink/client/deployment/Flip6StandaloneClusterDescriptor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.client.deployment;
-
-import org.apache.flink.client.program.rest.RestClusterClient;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.JobManagerOptions;
-import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.util.FlinkException;
-import org.apache.flink.util.Preconditions;
-
-/**
- * A deployment descriptor for an existing cluster.
- */
-public class Flip6StandaloneClusterDescriptor implements ClusterDescriptor<StandaloneClusterId> {
-
-	private final Configuration config;
-
-	public Flip6StandaloneClusterDescriptor(Configuration config) {
-		this.config = Preconditions.checkNotNull(config);
-	}
-
-	@Override
-	public String getClusterDescription() {
-		String host = config.getString(JobManagerOptions.ADDRESS, "");
-		int port = config.getInteger(JobManagerOptions.PORT, -1);
-		return "FLIP-6 Standalone cluster at " + host + ":" + port;
-	}
-
-	@Override
-	public RestClusterClient<StandaloneClusterId> retrieve(StandaloneClusterId standaloneClusterId) throws ClusterRetrieveException {
-		try {
-			return new RestClusterClient<>(config, standaloneClusterId);
-		} catch (Exception e) {
-			throw new ClusterRetrieveException("Couldn't retrieve FLIP-6 standalone cluster", e);
-		}
-	}
-
-	@Override
-	public RestClusterClient<StandaloneClusterId> deploySessionCluster(ClusterSpecification clusterSpecification) {
-		throw new UnsupportedOperationException("Can't deploy a FLIP-6 standalone cluster.");
-	}
-
-	@Override
-	public RestClusterClient<StandaloneClusterId> deployJobCluster(
-			ClusterSpecification clusterSpecification,
-			JobGraph jobGraph,
-			boolean detached) {
-		throw new UnsupportedOperationException("Can't deploy a standalone FLIP-6 per-job cluster.");
-	}
-
-	@Override
-	public void terminateCluster(StandaloneClusterId clusterId) throws FlinkException {
-		throw new UnsupportedOperationException("Cannot terminate a Flip-6 standalone cluster.");
-	}
-
-	@Override
-	public void close() throws Exception {
-		// nothing to do
-	}
-}

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/deployment/LegacyStandaloneClusterDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/deployment/LegacyStandaloneClusterDescriptor.java b/flink-clients/src/main/java/org/apache/flink/client/deployment/LegacyStandaloneClusterDescriptor.java
new file mode 100644
index 0000000..21e020c
--- /dev/null
+++ b/flink-clients/src/main/java/org/apache/flink/client/deployment/LegacyStandaloneClusterDescriptor.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.client.deployment;
+
+import org.apache.flink.client.program.StandaloneClusterClient;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.JobManagerOptions;
+import org.apache.flink.runtime.jobgraph.JobGraph;
+import org.apache.flink.util.FlinkException;
+
+/**
+ * A deployment descriptor for an existing cluster.
+ */
+public class LegacyStandaloneClusterDescriptor implements ClusterDescriptor<StandaloneClusterId> {
+
+	private final Configuration config;
+
+	public LegacyStandaloneClusterDescriptor(Configuration config) {
+		this.config = config;
+	}
+
+	@Override
+	public String getClusterDescription() {
+		String host = config.getString(JobManagerOptions.ADDRESS, "");
+		int port = config.getInteger(JobManagerOptions.PORT, -1);
+		return "Standalone cluster at " + host + ":" + port;
+	}
+
+	@Override
+	public StandaloneClusterClient retrieve(StandaloneClusterId standaloneClusterId) throws ClusterRetrieveException {
+		try {
+			return new StandaloneClusterClient(config);
+		} catch (Exception e) {
+			throw new ClusterRetrieveException("Couldn't retrieve standalone cluster", e);
+		}
+	}
+
+	@Override
+	public StandaloneClusterClient deploySessionCluster(ClusterSpecification clusterSpecification) {
+		throw new UnsupportedOperationException("Can't deploy a standalone cluster.");
+	}
+
+	@Override
+	public StandaloneClusterClient deployJobCluster(
+		ClusterSpecification clusterSpecification,
+		JobGraph jobGraph,
+		boolean detached) {
+		throw new UnsupportedOperationException("Can't deploy a standalone per-job cluster.");
+	}
+
+	@Override
+	public void terminateCluster(StandaloneClusterId clusterId) throws FlinkException {
+		throw new UnsupportedOperationException("Cannot terminate standalone clusters.");
+	}
+
+	@Override
+	public void close() throws Exception {
+		// nothing to do
+	}
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClusterDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClusterDescriptor.java b/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClusterDescriptor.java
index 83bb136..c4bcde6 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClusterDescriptor.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClusterDescriptor.java
@@ -18,11 +18,12 @@
 
 package org.apache.flink.client.deployment;
 
-import org.apache.flink.client.program.StandaloneClusterClient;
+import org.apache.flink.client.program.rest.RestClusterClient;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.JobManagerOptions;
 import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.util.FlinkException;
+import org.apache.flink.util.Preconditions;
 
 /**
  * A deployment descriptor for an existing cluster.
@@ -32,7 +33,7 @@ public class StandaloneClusterDescriptor implements ClusterDescriptor<Standalone
 	private final Configuration config;
 
 	public StandaloneClusterDescriptor(Configuration config) {
-		this.config = config;
+		this.config = Preconditions.checkNotNull(config);
 	}
 
 	@Override
@@ -43,30 +44,30 @@ public class StandaloneClusterDescriptor implements ClusterDescriptor<Standalone
 	}
 
 	@Override
-	public StandaloneClusterClient retrieve(StandaloneClusterId standaloneClusterId) throws ClusterRetrieveException {
+	public RestClusterClient<StandaloneClusterId> retrieve(StandaloneClusterId standaloneClusterId) throws ClusterRetrieveException {
 		try {
-			return new StandaloneClusterClient(config);
+			return new RestClusterClient<>(config, standaloneClusterId);
 		} catch (Exception e) {
 			throw new ClusterRetrieveException("Couldn't retrieve standalone cluster", e);
 		}
 	}
 
 	@Override
-	public StandaloneClusterClient deploySessionCluster(ClusterSpecification clusterSpecification) {
+	public RestClusterClient<StandaloneClusterId> deploySessionCluster(ClusterSpecification clusterSpecification) {
 		throw new UnsupportedOperationException("Can't deploy a standalone cluster.");
 	}
 
 	@Override
-	public StandaloneClusterClient deployJobCluster(
-		ClusterSpecification clusterSpecification,
-		JobGraph jobGraph,
-		boolean detached) {
+	public RestClusterClient<StandaloneClusterId> deployJobCluster(
+			ClusterSpecification clusterSpecification,
+			JobGraph jobGraph,
+			boolean detached) {
 		throw new UnsupportedOperationException("Can't deploy a standalone per-job cluster.");
 	}
 
 	@Override
 	public void terminateCluster(StandaloneClusterId clusterId) throws FlinkException {
-		throw new UnsupportedOperationException("Cannot terminate standalone clusters.");
+		throw new UnsupportedOperationException("Cannot terminate a standalone cluster.");
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java
index 48c8891..e9c62f9 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java
@@ -71,7 +71,7 @@ public class CliFrontendPackageProgramTest extends TestLogger {
 		final Configuration configuration = new Configuration();
 		frontend = new CliFrontend(
 			configuration,
-			Collections.singletonList(new DefaultCLI(configuration)));
+			Collections.singletonList(new LegacyCLI(configuration)));
 	}
 
 	@Test

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestBase.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestBase.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestBase.java
index e2463f2..3c24376 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestBase.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestBase.java
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * Base test class for {@link CliFrontend} tests that wraps the Flip-6 vs. non-Flip-6 modes.
+ * Base test class for {@link CliFrontend} tests that wraps the new vs. legacy mode.
  */
 @RunWith(Parameterized.class)
 public abstract class CliFrontendTestBase extends TestLogger {
@@ -39,7 +39,7 @@ public abstract class CliFrontendTestBase extends TestLogger {
 
 	@Parameterized.Parameters(name = "Mode = {0}")
 	public static List<String> parameters() {
-		return Arrays.asList(CoreOptions.OLD_MODE, CoreOptions.FLIP6_MODE);
+		return Arrays.asList(CoreOptions.LEGACY_MODE, CoreOptions.NEW_MODE);
 	}
 
 	protected Configuration getConfiguration() {
@@ -51,10 +51,10 @@ public abstract class CliFrontendTestBase extends TestLogger {
 
 	static AbstractCustomCommandLine<?> getCli(Configuration configuration) {
 		switch (configuration.getString(CoreOptions.MODE)) {
-			case CoreOptions.OLD_MODE:
+			case CoreOptions.LEGACY_MODE:
+				return new LegacyCLI(configuration);
+			case CoreOptions.NEW_MODE:
 				return new DefaultCLI(configuration);
-			case CoreOptions.FLIP6_MODE:
-				return new Flip6DefaultCLI(configuration);
 		}
 		throw new IllegalStateException();
 	}

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java
index 8402b7e..6c13368 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java
@@ -34,7 +34,7 @@ import org.junit.rules.TemporaryFolder;
 import static org.junit.Assert.assertThat;
 
 /**
- * Tests for the {@link DefaultCLI}.
+ * Tests for the {@link LegacyCLI}.
  */
 public class DefaultCLITest extends CliFrontendTestBase {
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
index 4202de2..e7f9bf9 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
@@ -88,7 +88,7 @@ import org.apache.flink.runtime.rest.util.RestClientException;
 import org.apache.flink.runtime.rpc.RpcUtils;
 import org.apache.flink.runtime.util.ExecutorThreadFactory;
 import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.OptionalFailure;
@@ -148,7 +148,7 @@ import static org.mockito.Mockito.when;
  * <p>These tests verify that the client uses the appropriate headers for each
  * request, properly constructs the request bodies/parameters and processes the responses correctly.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class RestClusterClientTest extends TestLogger {
 
 	private static final String REST_ADDRESS = "http://localhost:1234";

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java
index 8ac729d..4f8c074 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java
@@ -274,20 +274,20 @@ public class CoreOptions {
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Constant value for the Flip-6 execution mode.
+	 * Constant value for the new execution mode.
 	 */
-	public static final String FLIP6_MODE = "flip6";
+	public static final String NEW_MODE = "new";
 
 	/**
 	 * Constant value for the old execution mode.
 	 */
-	public static final String OLD_MODE = "old";
+	public static final String LEGACY_MODE = "legacy";
 
 	/**
-	 * Switch to select the execution mode. Possible values are 'flip6' and 'old'.
+	 * Switch to select the execution mode. Possible values are {@link CoreOptions#NEW_MODE}
+	 * and {@link CoreOptions#LEGACY_MODE}.
 	 */
-	public static final ConfigOption<String> MODE = ConfigOptions
-		.key("mode")
-		.defaultValue(FLIP6_MODE)
-		.withDescription("Switch to select the execution mode. Possible values are 'flip6' and 'old'.");
+	public static final ConfigOption<String> MODE = key("mode")
+		.defaultValue(NEW_MODE)
+		.withDescription("Switch to select the execution mode. Possible values are 'new' and 'legacy'.");
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-dist/src/main/flink-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index f111ea7..46f06ef 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -267,7 +267,7 @@ fi
 
 # Define FLIP if it is not already set
 if [ -z "${FLINK_MODE}" ]; then
-    FLINK_MODE=$(readFromConfig ${KEY_FLINK_MODE} "flip6" "${YAML_CONF}")
+    FLINK_MODE=$(readFromConfig ${KEY_FLINK_MODE} "new" "${YAML_CONF}")
 fi
 
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-dist/src/main/flink-bin/bin/jobmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
index 10ff775..f03c0a9 100755
--- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
@@ -36,7 +36,7 @@ bin=`cd "$bin"; pwd`
 
 JOBMANAGER_TYPE=jobmanager
 
-if [[ "${FLINK_MODE}" == "flip6" ]]; then
+if [[ "${FLINK_MODE}" == "new" ]]; then
     JOBMANAGER_TYPE=standalonesession
 fi
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-dist/src/main/flink-bin/bin/start-cluster.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/start-cluster.sh b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
index 4b6eba1..068577b 100755
--- a/flink-dist/src/main/flink-bin/bin/start-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
@@ -50,4 +50,4 @@ fi
 shopt -u nocasematch
 
 # Start TaskManager instance(s)
-TMSlaves start $FLIP6
+TMSlaves start

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/stop-cluster.sh b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
index bcd97eb..7eb58be 100755
--- a/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
@@ -22,10 +22,8 @@ bin=`cd "$bin"; pwd`
 
 . "$bin"/config.sh
 
-FLIP6=$1
-
 # Stop TaskManager instance(s)
-TMSlaves stop $FLIP6
+TMSlaves stop
 
 # Stop JobManager instance(s)
 shopt -s nocasematch
@@ -35,15 +33,15 @@ if [[ $HIGH_AVAILABILITY == "zookeeper" ]]; then
 
     if [ ${MASTERS_ALL_LOCALHOST} = true ] ; then
         for master in ${MASTERS[@]}; do
-            "$FLINK_BIN_DIR"/jobmanager.sh stop "${FLIP6}"
+            "$FLINK_BIN_DIR"/jobmanager.sh stop
         done
     else
         for master in ${MASTERS[@]}; do
-            ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l \"${FLINK_BIN_DIR}/jobmanager.sh\" stop \"${FLIP6}\" &"
+            ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l \"${FLINK_BIN_DIR}/jobmanager.sh\" stop &"
         done
     fi
 
 else
-    "$FLINK_BIN_DIR"/jobmanager.sh stop "${FLIP6}"
+    "$FLINK_BIN_DIR"/jobmanager.sh stop
 fi
 shopt -u nocasematch

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-dist/src/main/flink-bin/bin/taskmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index daa209c..6baa79a 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -34,7 +34,7 @@ bin=`cd "$bin"; pwd`
 
 TYPE=taskmanager
 
-if [[ "${FLINK_MODE}" == "flip6" ]]; then
+if [[ "${FLINK_MODE}" == "new" ]]; then
     TYPE=taskexecutor
 fi
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
index 818ddcd..e629b7e 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
@@ -38,7 +38,7 @@ export FLINK_LIB_DIR
 
 ENTRY_POINT=org.apache.flink.mesos.runtime.clusterframework.MesosApplicationMasterRunner
 
-if [[ "${FLINK_MODE}" == "flip6" ]]; then
+if [[ "${FLINK_MODE}" == "new" ]]; then
     ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint
 fi
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
index 81368c5..1d8d1b0 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
@@ -43,7 +43,7 @@ export FLINK_LIB_DIR
 
 ENTRY_POINT=org.apache.flink.mesos.runtime.clusterframework.MesosTaskManager
 
-if [[ "${FLINK_MODE}" == "flip6" ]]; then
+if [[ "${FLINK_MODE}" == "new" ]]; then
     ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosTaskExecutorRunner
 fi
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-docs/pom.xml
----------------------------------------------------------------------
diff --git a/flink-docs/pom.xml b/flink-docs/pom.xml
index 8b41229..4132066 100644
--- a/flink-docs/pom.xml
+++ b/flink-docs/pom.xml
@@ -92,7 +92,7 @@ under the License.
 		</dependency>
 
 		<dependency>
-			<!-- Required because the surefire plugin tries to load the Flip6 category annotation -->
+			<!-- Required because the surefire plugin tries to load the New category annotation -->
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-test-utils-junit</artifactId>
 			<version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java b/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java
index bbb2024..6760583 100644
--- a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java
+++ b/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java
@@ -18,7 +18,7 @@
 
 package org.apache.flink.table.client.gateway.local;
 
-import org.apache.flink.client.cli.Flip6DefaultCLI;
+import org.apache.flink.client.cli.DefaultCLI;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.api.Types;
@@ -59,7 +59,7 @@ public class DependencyTest {
 			env,
 			Collections.singletonList(dependency),
 			new Configuration(),
-			new Flip6DefaultCLI(new Configuration()));
+			new DefaultCLI(new Configuration()));
 
 		final SessionContext session = new SessionContext("test-session", new Environment());
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-libraries/flink-streaming-python/src/main/java/org/apache/flink/streaming/python/api/environment/PythonEnvironmentFactory.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-streaming-python/src/main/java/org/apache/flink/streaming/python/api/environment/PythonEnvironmentFactory.java b/flink-libraries/flink-streaming-python/src/main/java/org/apache/flink/streaming/python/api/environment/PythonEnvironmentFactory.java
index 0f83169..8e437fe 100644
--- a/flink-libraries/flink-streaming-python/src/main/java/org/apache/flink/streaming/python/api/environment/PythonEnvironmentFactory.java
+++ b/flink-libraries/flink-streaming-python/src/main/java/org/apache/flink/streaming/python/api/environment/PythonEnvironmentFactory.java
@@ -20,6 +20,7 @@ package org.apache.flink.streaming.python.api.environment;
 
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.fs.Path;
+import org.apache.flink.streaming.api.environment.LegacyLocalStreamEnvironment;
 import org.apache.flink.streaming.api.environment.LocalStreamEnvironment;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
@@ -63,7 +64,7 @@ public class PythonEnvironmentFactory {
 	 * @return A local execution environment with the specified parallelism.
 	 */
 	public PythonStreamExecutionEnvironment create_local_execution_environment(Configuration config) {
-		return new PythonStreamExecutionEnvironment(new LocalStreamEnvironment(config), new Path(localTmpPath), tmpDistributedDir, scriptName);
+		return new PythonStreamExecutionEnvironment(new LegacyLocalStreamEnvironment(config), new Path(localTmpPath), tmpDistributedDir, scriptName);
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java b/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java
index 6902cb5..41e7f4e 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java
@@ -119,7 +119,7 @@ public class KvStateClientProxyImpl extends AbstractServerBase<KvStateRequest, K
 		final KvStateLocationOracle legacyKvStateLocationOracle = kvStateLocationOracles.get(HighAvailabilityServices.DEFAULT_JOB_ID);
 
 		// we give preference to the oracle registered under the default job id
-		// to make it work with the pre Flip-6 code paths
+		// to make it work with the legacy code paths
 		if (legacyKvStateLocationOracle != null) {
 			return legacyKvStateLocationOracle;
 		} else {

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImplTest.java
----------------------------------------------------------------------
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImplTest.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImplTest.java
index cd33255..7e1cc24 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImplTest.java
+++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImplTest.java
@@ -85,7 +85,7 @@ public class KvStateClientProxyImplTest extends TestLogger {
 	 * will be used for all requests.
 	 */
 	@Test
-	public void testPreFlip6CodePathPreference() {
+	public void testLegacyCodePathPreference() {
 		final TestingKvStateLocationOracle kvStateLocationOracle = new TestingKvStateLocationOracle();
 		kvStateClientProxy.updateKvStateLocationOracle(HighAvailabilityServices.DEFAULT_JOB_ID, kvStateLocationOracle);
 		final JobID jobId = new JobID();

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/HighAvailabilityServices.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/HighAvailabilityServices.java b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/HighAvailabilityServices.java
index e65e952..e70032a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/HighAvailabilityServices.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/HighAvailabilityServices.java
@@ -58,8 +58,8 @@ public interface HighAvailabilityServices extends AutoCloseable {
 
 	/**
 	 * This JobID should be used to identify the old JobManager when using the
-	 * {@link HighAvailabilityServices}. With Flip-6 every JobManager will have a distinct
-	 * JobID assigned.
+	 * {@link HighAvailabilityServices}. With the new mode every JobMaster will have a
+	 * distinct JobID assigned.
 	 */
 	JobID DEFAULT_JOB_ID = new JobID(0L, 0L);
 
@@ -83,7 +83,7 @@ public interface HighAvailabilityServices extends AutoCloseable {
 	 *
 	 * @param jobID The identifier of the job.
 	 * @return Leader retrieval service to retrieve the job manager for the given job
-	 * @deprecated This method should only be used by non Flip-6 code where the JobManager acts as the master.
+	 * @deprecated This method should only be used by the legacy code where the JobManager acts as the master.
 	 */
 	@Deprecated
 	LeaderRetrievalService getJobManagerLeaderRetriever(JobID jobID);

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SharedSlot.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SharedSlot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SharedSlot.java
index d922d7c..4998d26 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SharedSlot.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SharedSlot.java
@@ -58,7 +58,7 @@ public class SharedSlot extends Slot implements LogicalSlot {
 	private final Set<Slot> subSlots;
 
 	// ------------------------------------------------------------------------
-	//  Old Constructors (prior FLIP-6)
+	//  Old Constructors (legacy code)
 	// ------------------------------------------------------------------------
 
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SimpleSlot.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SimpleSlot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SimpleSlot.java
index e69247e..386cdcd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SimpleSlot.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SimpleSlot.java
@@ -58,7 +58,7 @@ public class SimpleSlot extends Slot implements LogicalSlot {
 	private volatile Locality locality = Locality.UNCONSTRAINED;
 
 	// ------------------------------------------------------------------------
-	//  Old Constructors (prior FLIP-6)
+	//  Old Constructors (legacy mode)
 	// ------------------------------------------------------------------------
 
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/java/org/apache/flink/runtime/instance/Slot.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/Slot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/Slot.java
index dbd6554..9c1b627 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/Slot.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/Slot.java
@@ -61,7 +61,7 @@ public abstract class Slot {
 	/** State where all tasks in this slot have been canceled and the slot been given back to the instance */
 	private static final int RELEASED = 2;
 
-	// temporary placeholder for Slots that are not constructed from an AllocatedSlot (prior to FLIP-6)
+	// temporary placeholder for Slots that are not constructed from an AllocatedSlot (by legacy code)
 	protected static final AllocationID NO_ALLOCATION_ID = new AllocationID(0L, 0L);
 	protected static final SlotRequestId NO_SLOT_REQUEST_ID = new SlotRequestId(0L, 0L);
 	protected static final SlotSharingGroupId NO_SLOT_SHARING_GROUP_ID = new SlotSharingGroupId(0L, 0L);
@@ -92,7 +92,7 @@ public abstract class Slot {
 	/**
 	 * Base constructor for slots.
 	 * 
-	 * <p>This is the old way of constructing slots, prior to the FLIP-6 resource management refactoring.
+	 * <p>This is the old way of constructing slots by the legacy code
 	 * 
 	 * @param owner The component from which this slot is allocated.
 	 * @param location The location info of the TaskManager where the slot was allocated from

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java
index baa452f..8b098ac 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java
@@ -21,6 +21,7 @@ package org.apache.flink.runtime.jobmanager.scheduler;
 import org.apache.flink.runtime.instance.Instance;
 import org.apache.flink.runtime.instance.SharedSlot;
 import org.apache.flink.runtime.jobmaster.SlotRequestId;
+import org.apache.flink.runtime.jobmaster.slotpool.SlotPool;
 import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
 import org.apache.flink.util.AbstractID;
 import org.apache.flink.util.FlinkException;
@@ -172,7 +173,7 @@ public class CoLocationConstraint {
 	 * Locks the location of this slot. The location can be locked only once
 	 * and only after a shared slot has been assigned.
 	 *
-	 * <p>Note: This method exists for compatibility reasons with the Flip-6 SlotPool
+	 * <p>Note: This method exists for compatibility reasons with the new {@link SlotPool}.
 	 *
 	 * @param taskManagerLocation to lock this co-location constraint to
 	 */

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
index 66770c5..59e5ff0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
@@ -95,7 +95,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
 import static org.apache.flink.util.Preconditions.checkState;
 
 /**
- * Flip-6 based MiniCluster.
+ * MiniCluster to execute Flink jobs locally.
  */
 public class MiniCluster implements JobExecutorService, AutoCloseableAsync {
 
@@ -580,7 +580,7 @@ public class MiniCluster implements JobExecutorService, AutoCloseableAsync {
 			throw new JobExecutionException(job.getJobID(), e);
 		}
 
-		// we have to allow queued scheduling in Flip-6 mode because we need to request slots
+		// we have to allow queued scheduling in the new mode because we need to request slots
 		// from the ResourceManager
 		job.setAllowQueuedScheduling(true);
 
@@ -614,7 +614,7 @@ public class MiniCluster implements JobExecutorService, AutoCloseableAsync {
 			throw new JobExecutionException(job.getJobID(), e);
 		}
 
-		// we have to allow queued scheduling in Flip-6 mode because we need to request slots
+		// we have to allow queued scheduling in the new mode because we need to request slots
 		// from the ResourceManager
 		job.setAllowQueuedScheduling(true);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateRegistry.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateRegistry.java b/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateRegistry.java
index 63d3c52..430b06b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateRegistry.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateRegistry.java
@@ -167,7 +167,7 @@ public class KvStateRegistry {
 	// ------------------------------------------------------------------------
 
 	private KvStateRegistryListener getKvStateRegistryListener(JobID jobId) {
-		// first check whether we are running the pre-Flip-6 code which registers
+		// first check whether we are running the legacy code which registers
 		// a single listener under HighAvailabilityServices.DEFAULT_JOB_ID
 		KvStateRegistryListener listener = listeners.get(HighAvailabilityServices.DEFAULT_JOB_ID);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index 15581b2..0aaeae3 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -1204,7 +1204,7 @@ class TaskManager(
 
       val jobID = jobInformation.getJobId
 
-      // Allocation ids do not work properly without flip-6, so we just fake one, based on the jid.
+      // Allocation ids do not work properly in legacy mode, so we just fake one, based on the jid.
       val fakeAllocationID = new AllocationID(jobID.getLowerPart, jobID.getUpperPart)
 
       val taskLocalStateStore = taskManagerLocalStateStoresManager.localStateStoreForSubtask(

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
index e87e1ce..18a8ec1 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
@@ -65,7 +65,7 @@ import org.apache.flink.runtime.state.StateBackend;
 import org.apache.flink.runtime.testtasks.NoOpInvokable;
 import org.apache.flink.runtime.testutils.InMemorySubmittedJobGraphStore;
 import org.apache.flink.runtime.util.TestingFatalErrorHandler;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.TestLogger;
@@ -116,7 +116,7 @@ import static org.junit.Assert.fail;
 /**
  * Test for the {@link Dispatcher} component.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class DispatcherTest extends TestLogger {
 
 	private static RpcService rpcService;

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileArchivedExecutionGraphStoreTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileArchivedExecutionGraphStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileArchivedExecutionGraphStoreTest.java
index e6d700e..90c5beb 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileArchivedExecutionGraphStoreTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileArchivedExecutionGraphStoreTest.java
@@ -28,7 +28,7 @@ import org.apache.flink.runtime.messages.webmonitor.JobsOverview;
 import org.apache.flink.runtime.rest.handler.legacy.utils.ArchivedExecutionGraphBuilder;
 import org.apache.flink.runtime.testingUtils.TestingUtils;
 import org.apache.flink.runtime.webmonitor.WebMonitorUtils;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.Preconditions;
 import org.apache.flink.util.TestLogger;
 
@@ -60,7 +60,7 @@ import static org.junit.Assert.assertThat;
 /**
  * Tests for the {@link FileArchivedExecutionGraphStore}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class FileArchivedExecutionGraphStoreTest extends TestLogger {
 
 	private static final List<JobStatus> GLOBALLY_TERMINAL_JOB_STATUS = Arrays.stream(JobStatus.values())

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MiniDispatcherTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MiniDispatcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MiniDispatcherTest.java
index e363393..5790b8a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MiniDispatcherTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MiniDispatcherTest.java
@@ -44,7 +44,7 @@ import org.apache.flink.runtime.rpc.RpcService;
 import org.apache.flink.runtime.rpc.RpcUtils;
 import org.apache.flink.runtime.rpc.TestingRpcService;
 import org.apache.flink.runtime.util.TestingFatalErrorHandler;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.After;
@@ -72,7 +72,7 @@ import static org.mockito.Mockito.when;
 /**
  * Tests for the {@link MiniDispatcher}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class MiniDispatcherTest extends TestLogger {
 
 	private static final Time timeout = Time.seconds(10L);

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java
index 77d12d5..1d4babf 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/heartbeat/HeartbeatManagerTest.java
@@ -24,7 +24,7 @@ import org.apache.flink.runtime.concurrent.Executors;
 import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.concurrent.ScheduledExecutorServiceAdapter;
 import org.apache.flink.runtime.util.DirectExecutorService;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.Test;
@@ -57,7 +57,7 @@ import static org.mockito.Mockito.when;
 /**
  * Tests for the {@link HeartbeatManager}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class HeartbeatManagerTest extends TestLogger {
 	private static final Logger LOG = LoggerFactory.getLogger(HeartbeatManagerTest.class);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java
index c93dbcc..737b5ee 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java
@@ -113,7 +113,7 @@ public class StandaloneHaServicesTest extends TestLogger {
 	 * fixed leader session id.
 	 */
 	@Test
-	public void testJobManagerLeaderRetrievalFlip6() throws Exception {
+	public void testJobMasterLeaderRetrieval() throws Exception {
 		JobID jobId1 = new JobID();
 		JobID jobId2 = new JobID();
 		final String jobManagerAddress1 = "foobar";

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
index aab8132..067001d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulerSlotSharingTest.java
@@ -753,7 +753,7 @@ public class SchedulerSlotSharingTest extends SchedulerTestBase {
 			
 			// check the scheduler's bookkeeping
 			assertEquals(4, testingSlotProvider.getNumberOfLocalizedAssignments());
-			// Flip-6 supports host localized assignments which happen in this case because all TaskManagerLocations point to the loopback address
+			// Flink supports host localized assignments which happen in this case because all TaskManagerLocations point to the loopback address
 			assertTrue(2 == testingSlotProvider.getNumberOfNonLocalizedAssignments() || 2 == testingSlotProvider.getNumberOfHostLocalizedAssignments());
 
 			assertEquals(0, testingSlotProvider.getNumberOfUnconstrainedAssignments());

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
index 62f5ee2..2f61681 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
@@ -59,7 +59,7 @@ import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGateway;
 import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation;
 import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
 import org.apache.flink.runtime.util.TestingFatalErrorHandler;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.hamcrest.Matchers;
@@ -86,7 +86,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 /**
  * Tests for {@link JobMaster}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class JobMasterTest extends TestLogger {
 
 	@ClassRule

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobResultTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobResultTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobResultTest.java
index 1c7f0dd..3d79337 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobResultTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobResultTest.java
@@ -19,7 +19,7 @@
 package org.apache.flink.runtime.jobmaster;
 
 import org.apache.flink.api.common.JobID;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.SerializedThrowable;
 import org.apache.flink.util.TestLogger;
 
@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 /**
  * Tests for {@link JobResult}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class JobResultTest extends TestLogger {
 
 	@Test

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
index f97ff4f..e18412b 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AllocatedSlotsTest.java
@@ -25,7 +25,7 @@ import org.apache.flink.runtime.executiongraph.utils.SimpleAckingTaskManagerGate
 import org.apache.flink.runtime.jobmaster.SlotRequestId;
 import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation;
 import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.Test;
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-@Category(Flip6.class)
+@Category(New.class)
 public class AllocatedSlotsTest extends TestLogger {
 
 	@Test

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
index c0074ed..ed090d8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/AvailableSlotsTest.java
@@ -25,7 +25,7 @@ import org.apache.flink.runtime.clusterframework.types.SlotProfile;
 import org.apache.flink.runtime.jobmanager.slots.SlotAndLocality;
 import org.apache.flink.runtime.jobmanager.slots.TaskManagerGateway;
 import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.Test;
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@Category(Flip6.class)
+@Category(New.class)
 public class AvailableSlotsTest extends TestLogger {
 
 	static final ResourceProfile DEFAULT_TESTING_PROFILE = new ResourceProfile(1.0, 512);

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
index 4504b5a..503173a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DualKeyMapTest.java
@@ -19,7 +19,7 @@
 package org.apache.flink.runtime.jobmaster.slotpool;
 
 import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.hamcrest.Matchers;
@@ -36,7 +36,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 /**
  * Tests for the {@link DualKeyMap}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class DualKeyMapTest extends TestLogger {
 
 	@Test

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
index 4c736e8..52d7237 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolRpcTest.java
@@ -46,7 +46,7 @@ import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
 import org.apache.flink.runtime.testingUtils.TestingUtils;
 import org.apache.flink.runtime.util.clock.Clock;
 import org.apache.flink.runtime.util.clock.SystemClock;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.Preconditions;
 import org.apache.flink.util.TestLogger;
@@ -72,7 +72,7 @@ import static org.junit.Assert.fail;
 /**
  * Tests for the SlotPool using a proper RPC setup.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class SlotPoolRpcTest extends TestLogger {
 
 	private static RpcService rpcService;

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
index b9036c1..75b0d05 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolSchedulingTestBase.java
@@ -24,7 +24,7 @@ import org.apache.flink.runtime.resourcemanager.utils.TestingResourceManagerGate
 import org.apache.flink.runtime.rpc.RpcUtils;
 import org.apache.flink.runtime.rpc.TestingRpcService;
 import org.apache.flink.runtime.testingUtils.TestingUtils;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.After;
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeoutException;
 /**
  * Test base for {@link SlotPool} related scheduling test cases.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class SlotPoolSchedulingTestBase extends TestLogger {
 
 	private static final JobID jobId = new JobID();

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
index 502b076..f025bc8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolTest.java
@@ -45,7 +45,7 @@ import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation;
 import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
 import org.apache.flink.runtime.testingUtils.TestingUtils;
 import org.apache.flink.runtime.util.clock.ManualClock;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.TestLogger;
@@ -80,7 +80,7 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@Category(Flip6.class)
+@Category(New.class)
 public class SlotPoolTest extends TestLogger {
 
 	private static final Logger LOG = LoggerFactory.getLogger(SlotPoolTest.class);

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
index ec6eae2..4c56c63 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SlotSharingManagerTest.java
@@ -29,7 +29,7 @@ import org.apache.flink.runtime.jobmaster.LogicalSlot;
 import org.apache.flink.runtime.jobmaster.SlotContext;
 import org.apache.flink.runtime.jobmaster.SlotRequestId;
 import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.AbstractID;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.TestLogger;
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Test cases for the {@link SlotSharingManager}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class SlotSharingManagerTest extends TestLogger {
 
 	private static final SlotSharingGroupId SLOT_SHARING_GROUP_ID = new SlotSharingGroupId();

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java
index 646827a..c9ac4c6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/minicluster/MiniClusterITCase.java
@@ -27,7 +27,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.runtime.jobgraph.JobVertex;
 import org.apache.flink.runtime.jobgraph.ScheduleMode;
 import org.apache.flink.runtime.testtasks.NoOpInvokable;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.BeforeClass;
@@ -39,7 +39,7 @@ import java.io.IOException;
 /**
  * Integration test cases for the {@link MiniCluster}.
  */
-@Category(Flip6.class)
+@Category(New.class)
 public class MiniClusterITCase extends TestLogger {
 
 	private static Configuration configuration;

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java
index 36a85d1..c1c56bf 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java
@@ -217,7 +217,7 @@ public class KvStateRegistryTest extends TestLogger {
 	 * will be used for all notifications.
 	 */
 	@Test
-	public void testPreFlip6CodePathPreference() {
+	public void testLegacyCodePathPreference() {
 		final KvStateRegistry kvStateRegistry = new KvStateRegistry();
 		final ArrayDeque<JobID> stateRegistrationNotifications = new ArrayDeque<>(2);
 		final ArrayDeque<JobID> stateDeregistrationNotifications = new ArrayDeque<>(2);

http://git-wip-us.apache.org/repos/asf/flink/blob/af5279e9/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/JobLeaderIdServiceTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/JobLeaderIdServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/JobLeaderIdServiceTest.java
index 301ab46..25d7b5b 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/JobLeaderIdServiceTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/JobLeaderIdServiceTest.java
@@ -24,7 +24,7 @@ import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.highavailability.TestingHighAvailabilityServices;
 import org.apache.flink.runtime.jobmaster.JobMasterId;
 import org.apache.flink.runtime.leaderretrieval.SettableLeaderRetrievalService;
-import org.apache.flink.testutils.category.Flip6;
+import org.apache.flink.testutils.category.New;
 import org.apache.flink.util.TestLogger;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -56,7 +56,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@Category(Flip6.class)
+@Category(New.class)
 public class JobLeaderIdServiceTest extends TestLogger {
 
 	/**


Mime
View raw message