From b3a84b45c94ea2caca858c698d8ad0db720f6720 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 28 Aug 2018 17:04:04 -0400
Subject: [PATCH] Update the changelog with latest pull requests

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 551c497..6e6ea86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 Version TBD (In Progress on the Develop Branch):
+    * FIX #1237 SmartOS should use pkgin show-deps (sjorge) #1283
+    * Fedora: Reduce DNF calls to 2 during install_dep phase (The-Loeki) #1278
 
 Version 2018.08.15:
     * Add tests using kitchen-salt #1279