[commit: ghc] ghc-7.10: base: Export GHC.Event(.Internal).Lifetime (b324fac)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/b324fac4e9769c963620ccfc645e0ee2890da5b7/ghc

>---------------------------------------------------------------

commit b324fac4e9769c963620ccfc645e0ee2890da5b7
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Apr 25 09:13:49 2015 +0200

    base: Export GHC.Event(.Internal).Lifetime
    
    This was an unfortunate oversight in the original event manager rework
    patch. Fixes #10308
    
    Differential Revision: https://phabricator.haskell.org/D845
    
    (cherry picked from commit 9a0c17950fdfd0c89c672da9d8b25a419f66c1f8)


>---------------------------------------------------------------

b324fac4e9769c963620ccfc645e0ee2890da5b7
 libraries/base/GHC/Event.hs          | 1 +
 libraries/base/GHC/Event/Internal.hs | 2 ++
 libraries/base/changelog.md          | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/libraries/base/GHC/Event.hs b/libraries/base/GHC/Event.hs
index 436914c..9f1d3df 100644
--- a/libraries/base/GHC/Event.hs
+++ b/libraries/base/GHC/Event.hs
@@ -25,6 +25,7 @@ module GHC.Event
     , evtWrite
     , IOCallback
     , FdKey(keyFd)
+    , Lifetime(..)
     , registerFd
     , unregisterFd
     , unregisterFd_
diff --git a/libraries/base/GHC/Event/Internal.hs b/libraries/base/GHC/Event/Internal.hs
index c18bd7f..3b75c8b 100644
--- a/libraries/base/GHC/Event/Internal.hs
+++ b/libraries/base/GHC/Event/Internal.hs
@@ -84,6 +84,8 @@ evtConcat = foldl' evtCombine evtNothing
 {-# INLINE evtConcat #-}
 
 -- | The lifetime of a registration.
+--
+-- @since 4.8.1.0
 data Lifetime = OneShot | MultiShot
               deriving (Show, Eq)
 
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 4facf0c..f7f1b5b 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -1,5 +1,11 @@
 # Changelog for [`base` package](http://hackage.haskell.org/package/base)
 
+## 4.8.1.0  *TBA*
+
+  * Bundled with GHC 7.10.2
+
+  * `Lifetime` is now exported from `GHC.Event`
+
 ## 4.8.0.0  *Mar 2015*
 
   * Bundled with GHC 7.10.1