commit 06bed079826eb1a0eb54371c4175b2cfd055aa60
Merge: 1b1e924 4d70969
Author: Klaus Aehlig <[email protected]>
Date:   Tue Jul 8 14:03:28 2014 +0200

    Merge branch 'stable-2.12' into master
    
    * stable-2.12
      Readd Statistics to list of test files
      Add basic serialization tests for TempRes's data types
      Add equality and serialization tests for MultiMap
      Add an utility function for generating random maps
      Move old reservation code to Python tests
      Let config.py call WConfd for IP reservations
      Expose IP reservations through WConfd RPC
      Enhance functions for modifying the configuration in WConfd
      Atomic updates of an IORef with logging and errors
      Add an alias for WriterLogT Identity
      Add functions for temporary reservations of IP addresses
      Refactor and add utility functions for temp. reservations
      Remove 'generate' from TempRes module
      Ensure that temp.res. functions throw ReservationError
      An lens-like utility function for accessing a Container
      Make AddressPool included within Network
      mapMOf2: traversing a lens over a monad + applicative
      Add module for implementing bit arrays in Haskell
      Hide the implementation of Ip4Address
      Persist temporary reservations in WConfd
      Add JSON instances for temporary reservation data structures
      Abstract WConfd resources that need to be saved/loaded
      Before rename do fsync(2)
      Add a foreign function call to fsync(2)
      Ensure config. file is written to disk after modifications
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      (no changes)
    
    * stable-2.9
      Push return out of genericResult
      Make htools tolerate missing "spfree" on luxi
    
    Signed-off-by: Klaus Aehlig <[email protected]>


-- 
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores

Reply via email to