Merge branch 'unstable' of github.com:huangz1990/redis-3.0-annotated into unstable

huangzworks · huangzworks · commit c4655455d9e0 · 2014-09-15T19:21:48.000+08:00
diff --git a/src/t_hash.c b/src/t_hash.c
@@ -427,7 +427,7 @@ hashTypeIterator *hashTypeInitIterator(robj *subject) {
         redisPanic("Unknown hash encoding");
     }
 
-    // 返沪迭代器
+    // 返回迭代器
     return hi;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ hashTypeIterator hashTypeInitIterator(robj subject) {`
`427`	`427`	`redisPanic("Unknown hash encoding");`
`428`	`428`	`}`
`429`	`429`
`430`		`- // 返沪迭代器`
	`430`	`+ // 返回迭代器`
`431`	`431`	`return hi;`
`432`	`432`	`}`
`433`	`433`