From 101b2d225f4f3a8a7401a79fa8905e4e3f41ef14 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Sat, 21 Jun 2014 13:25:24 +0100
Subject: [PATCH] Update changes log

---
 ChangeLog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 718952f..ec35ed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,14 @@
-Version 2014.xx.xx:
+Version 2014.06.21:
+	* Also export the HTTPS proxy environment variable. Thanks Giuseppe Iannello(gianello).
 	* Distro Support Fixed:
 		* Improve Oracle Linux Server detection
-
+		* Overcome the Oracle Linux awkwardness. `--enablerepo=XYX` disables ALL OTHER REPOS!!!!
 
 Version 2014.06.19:
 	* Allow passing the master address as an environment variable, `BS_SALT_MASTER_ADDRESS`
 	* Fixed an issue with the keys pre-seed. We were passing absolute paths where we only needed 
 	basenames.
-	* Added HTTP proxy configuration support. Thanks @gianello
+	* Added HTTP proxy configuration support. Thanks Giuseppe Iannello(gianello),
 	* Distro Support Added:
 		* Elementary OS
 		* RHEL 7 Beta/RC
@@ -15,7 +16,6 @@ Version 2014.06.19:
 	* Distro Support Fixed:
 		* Improved RHEL optionals repository detection
 
-
 Version 2014.04.16:
 	* Fixed a bug for RHEL 6 based distributions where yum-utils was not getting installed.
 	* Added minor version check for RHEL 6 optional channel.