From d9c863350bc46526dcfd9472db530143631357b4 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 14 Mar 2023 17:51:33 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E7=AE=97=E5=8A=9B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=9F=AD=E6=9C=9F=E5=9B=9E=E6=94=B6=E7=9A=84=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF'=20(#3170)=20from=20fix-3045=20into=20V20221116?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index db203fbd..9bf9c460 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '修复 -管理后台修改资源池队列的卡数为0时会失败' (#3174) from fix-3163 into V20221116
+Merge pull request '算力资源管理支持资源短期回收的场景' (#3170) from fix-3045 into V20221116