From 0c85abb0547ad5d19cb2ff68feb58ac6c4a15d51 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Sun, 5 Jul 2015 18:46:03 +0200
Subject: [PATCH] adding notes about parallel S3 uploads to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bf29d6..688efd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### unreleased
+- New: Files are now uploaded to S3 in parallel. This can be disabled by setting `parallel: false` in `_deploy.yml`. [#63](https://github.com/octopress/deploy/pull/63)
+
 ### 1.3.0 - 2015-07-05
 - New: Now `_deploy.yml` is processed through ERB, this means you can load configurations for ENV vars pretty easily. [#62](https://github.com/octopress/deploy/pull/62)