From 0bb2ada5870b3d83ffc851212842a804861f2d1a Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Wed, 22 Aug 2018 09:36:30 -0400
Subject: [PATCH 1/2] Add changelog

---
 CHANGELOG.md | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000000..db17b199d687
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,43 @@
+# Prefect Changelog
+
+## 0.4.0 <Badge text="development" type="warn">
+
+### Major Features
+- Local parallelism with `DaskExecutor` (#151)
+
+### Minor Features
+- `ShellTask` (#150)
+
+### Fixes
+- Fix issue with versioneer not picking up git tags (#146)
+
+### Breaking Changes
+- None
+
+
+## 0.3.0 <Badge text="alpha" type="warn">
+
+0.3.0 is the preview release of Prefect.
+
+### Major Features
+- BokehRunner (#104, #128)
+- Control flow: `ifelse`, `switch`, and `merge` (#92)
+- Set state from `reference_tasks` (#95, #137)
+- Add flow `Registry` (#90)
+- Output caching with various `cache_validators` (#84, #107)
+- Dask executor (#82, #86)
+- Automatic input caching for retries, manual-only triggers (#78)
+
+### Minor Features
+- Add custom syntax highlighting to docs (#141)
+- Add `bind()` method for tasks to call without copying (#132)
+- Cache expensive flow graph methods (#125)
+- Docker environments (#71)
+- Automatic versioning via Versioneer (#70)
+- `TriggerFail` state (#67)
+- State classes (#59)
+
+### Fixes
+- None
+### Breaking Changes
+- None

From e69af00d93accf8be0a5eba8fd6abc763a96f0cf Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Wed, 22 Aug 2018 09:40:24 -0400
Subject: [PATCH 2/2] Add changelog to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db17b199d687..c0e3196966ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Local parallelism with `DaskExecutor` (#151)
 
 ### Minor Features
+- Add changelog (#153)
 - `ShellTask` (#150)
 
 ### Fixes
@@ -39,5 +40,6 @@
 
 ### Fixes
 - None
+
 ### Breaking Changes
 - None