Merge branch 'master' of github.com:Qihoo360/pika

beckyame · Oct 31, 2017 · 549094b · 549094b
2 parents c152807 + 9b42648
commit 549094b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 18 deletions.
diff --git a/src/pika_binlog_sender_thread.cc b/src/pika_binlog_sender_thread.cc
@@ -294,4 +294,3 @@ void* PikaBinlogSenderThread::ThreadMain() {
   }
   return NULL;
 }
-
diff --git a/src/pika_bit.cc b/src/pika_bit.cc
@@ -224,6 +224,3 @@ void BitOpCmd::Do() {
   }
 
 }
-
-
-
diff --git a/src/pika_hash.cc b/src/pika_hash.cc
@@ -474,7 +474,3 @@ void HScanCmd::Do() {
   }
   return;
 }
-
-
-
-
diff --git a/src/pika_kv.cc b/src/pika_kv.cc
@@ -798,12 +798,3 @@ void ScanCmd::Do() {
   }
   return;
 }
-
-
-
-
-
-
-
-
-
diff --git a/src/pika_zset.cc b/src/pika_zset.cc
@@ -969,4 +969,3 @@ void ZRemrangebylexCmd::Do() {
   res_.AppendInteger(count);
   return;
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -294,4 +294,3 @@ void* PikaBinlogSenderThread::ThreadMain() {
		}
		return NULL;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -969,4 +969,3 @@ void ZRemrangebylexCmd::Do() {
		res_.AppendInteger(count);
		return;
		}