From e995244e8734f3e0e6b3b54a24774783eada35df Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Fri, 21 Jan 2022 14:55:06 +0800 Subject: [PATCH 1/2] cherry pick #490 to release-3.1 Signed-off-by: ti-srebot --- .../java/org/tikv/util/ConcreteBackOfferTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/org/tikv/util/ConcreteBackOfferTest.java b/src/test/java/org/tikv/util/ConcreteBackOfferTest.java index 0b8adcf20e9..2b932e9c9a4 100644 --- a/src/test/java/org/tikv/util/ConcreteBackOfferTest.java +++ b/src/test/java/org/tikv/util/ConcreteBackOfferTest.java @@ -1,16 +1,31 @@ /* +<<<<<<< HEAD * Copyright 2017 PingCAP, Inc. +======= + * Copyright 2021 TiKV Project Authors. +>>>>>>> a7e0e74b... [close #489 ] fix backoffer data race (#490) * * Licensed 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 * +<<<<<<< HEAD * 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, * See the License for the specific language governing permissions and * limitations under the License. +======= + * 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. + * +>>>>>>> a7e0e74b... [close #489 ] fix backoffer data race (#490) */ package org.tikv.util; From ecaa89e52a520f54072ba07930a0bb1a41ee9f90 Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Fri, 21 Jan 2022 14:59:30 +0800 Subject: [PATCH 2/2] fix license error Signed-off-by: iosmanthus --- .../java/org/tikv/util/ConcreteBackOfferTest.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/test/java/org/tikv/util/ConcreteBackOfferTest.java b/src/test/java/org/tikv/util/ConcreteBackOfferTest.java index 2b932e9c9a4..f3fe77d63fa 100644 --- a/src/test/java/org/tikv/util/ConcreteBackOfferTest.java +++ b/src/test/java/org/tikv/util/ConcreteBackOfferTest.java @@ -1,22 +1,10 @@ /* -<<<<<<< HEAD - * Copyright 2017 PingCAP, Inc. -======= * Copyright 2021 TiKV Project Authors. ->>>>>>> a7e0e74b... [close #489 ] fix backoffer data race (#490) * * Licensed 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 * -<<<<<<< HEAD - * 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, - * See the License for the specific language governing permissions and - * limitations under the License. -======= * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software @@ -25,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ->>>>>>> a7e0e74b... [close #489 ] fix backoffer data race (#490) */ package org.tikv.util;