From cd7906d72e91d5049e534227d105305da5eacb04 Mon Sep 17 00:00:00 2001
From: "Julian K. Arni" <jkarni@gmail.com>
Date: Mon, 28 Sep 2015 18:17:22 +0200
Subject: [PATCH] Changelog updates and 7.8 fixes.

---
 servant-client/CHANGELOG.md            | 1 +
 servant/CHANGELOG.md                   | 1 +
 servant/src/Servant/API/Alternative.hs | 9 +++++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/servant-client/CHANGELOG.md b/servant-client/CHANGELOG.md
index c9052224..29398d95 100644
--- a/servant-client/CHANGELOG.md
+++ b/servant-client/CHANGELOG.md
@@ -3,6 +3,7 @@ HEAD
 
 * Support for the `HttpVersion`, `IsSecure`, `RemoteHost` and `Vault` combinators
 * Added support for `path` on `BaseUrl`.
+* `client` now takes an explicit `Manager` argument.
 
 0.4.1
 -----
diff --git a/servant/CHANGELOG.md b/servant/CHANGELOG.md
index e4f51e8c..043320ae 100644
--- a/servant/CHANGELOG.md
+++ b/servant/CHANGELOG.md
@@ -3,6 +3,7 @@ HEAD
 
 * Add `HttpVersion`, `IsSecure`, `RemoteHost` and `Vault` combinators
 * Fix safeLink, so Header is not in fact required.
+* Added more instances for (:<|>)
 
 0.4.2
 -----
diff --git a/servant/src/Servant/API/Alternative.hs b/servant/src/Servant/API/Alternative.hs
index 19ae52cc..752dcef0 100644
--- a/servant/src/Servant/API/Alternative.hs
+++ b/servant/src/Servant/API/Alternative.hs
@@ -1,15 +1,20 @@
 {-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveFunctor      #-}
+#if !MIN_VERSION_base(4,8,0)
+{-# LANGUAGE DeriveFoldable     #-}
+#endif
 {-# LANGUAGE DeriveTraversable  #-}
 {-# LANGUAGE TypeOperators      #-}
 {-# OPTIONS_HADDOCK not-home    #-}
 module Servant.API.Alternative ((:<|>)(..)) where
 
 #if !MIN_VERSION_base(4,8,0)
-import           Data.Monoid   (Monoid (..))
+import           Data.Monoid      (Monoid (..))
+import           Data.Traversable (Traversable)
+import           Data.Foldable    (Foldable)
 #endif
-import           Data.Typeable (Typeable)
+import           Data.Typeable    (Typeable)
 -- | Union of two APIs, first takes precedence in case of overlap.
 --
 -- Example: