From a094d93d9576e8a6c3a8fd344b870617856af300 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 09:38:54 +0800
Subject: [PATCH] updated CHANGELOG

---
 CHANGELOG-zh.md | 1 +
 CHANGELOG.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index bf091de3..03eaffe6 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -10,6 +10,7 @@
 
 ### Bug 修复
 - **定时任务爬虫选择问题**. 字段不会随着爬虫变化而响应.
+- **定时任务冲突问题**. 两个不同的爬虫设置定时任务，时间设置成相同的话，可能会有bug. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
 
 # 0.4.6 (2020-02-13)
 ### 功能 / 优化
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a044da4..142f3c72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - **Upgrade Check**. Check latest version and notifiy users to upgrade.
 - **Spiders Batch Operation**. Allow users to run/stop spider tasks and delete spiders in batches.
 - **Copy Spiders**. Allow users to copy an existing spider to create a new one.
+- **Cron Jobs Conflict**. Possible bug when two spiders set to the same time of their cron jobs. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
 
 ### Bug Fixes
 - **Schedule Spider Selection Issue**. Fields not responding to spider change.