From: antirez <antirez@gmail.com>
Date: Wed, 28 Nov 2012 10:41:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/c87a40897c82c4936563dee24bac481d970dc510?ds=inline;hp=-c

Merge remote-tracking branch 'origin/unstable' into unstable
---

c87a40897c82c4936563dee24bac481d970dc510
diff --combined src/debug.c
index 3d169b14,be3db882..2725aae6
--- a/src/debug.c
+++ b/src/debug.c
@@@ -37,6 -37,7 +37,7 @@@
  #include <execinfo.h>
  #include <ucontext.h>
  #include <fcntl.h>
+ #include "bio.h"
  #endif /* HAVE_BACKTRACE */
  
  /* ================================= Debugging ============================== */
@@@ -833,7 -834,7 +834,7 @@@ void watchdogScheduleSignal(int period
      setitimer(ITIMER_REAL, &it, NULL);
  }
  
 -/* Enable the software watchdong with the specified period in milliseconds. */
 +/* Enable the software watchdog with the specified period in milliseconds. */
  void enableWatchdog(int period) {
      int min_period;