« Previous | Next » 

Revision 791f317d

ID791f317d1395440a966631c9fb9fa40a7c40e950

Added by Guido Trotter about 12 years ago

Merge branch 'devel-2.1'

  • devel-2.1:
    burnin: implement basic confd testing
    AsyncUDPSocket.process_next_packet
    WaitForSocketCondition: rename, handle EINTR
    move http.WaitForSocketCondition to utils
    ConfdCountingCallback
    ConfdClient: add synchronous features
    Replace @keyword with @param in confd client
    AsyncUDPSocket: abstract do_read function
    Burnin: don't add/remove routed nics
    Only override any and all if not defined

Conflicts:
lib/http/__init__.py
trivial, double removal

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted