commit ee513e928d2814e786b0ffc23dbeb345c908429e
Merge: 0ad5291 837960e
Author: Klaus Aehlig <[email protected]>
Date:   Wed Feb 3 12:49:52 2016 +0100

    Merge branch 'stable-2.16' into stable-2.17
    
    * stable-2.16
      Update NEWS file for 2.16.0 beta2
      Update NEWS file for 2.16.0 beta2
      Bump version suffix to 2.16.0 beta2
      Set block buffering for UDSServer
    
    * stable-2.15
      Do not add a new Inotify watchers on timer
      Mock InitDrbdHelper's output in unittests
      Optimise codegen for Python OpCode classes
    
    * stable-2.14
      Fix failover in case the source node is offline
    
    Conflicts:
        configure.ac: ignore suffix bump


-- 
Klaus Aehlig
Google Germany GmbH, Erika-Mann-Str. 33, 80636 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle

Reply via email to