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?hp=23d517d2c4345abb896d58cb6ce6e5accd88d3d5

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

diff --git a/src/debug.c b/src/debug.c
index be3db882..2725aae6 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -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;