1) bugfix(scan) match-pattern should be applied after count; 2) updat…

…e nemo-rocksdb
LACERBA · Jun 28, 2017 · 8ec2a04 · 8ec2a04
1 parent 9c27add
commit 8ec2a04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,8 +28,8 @@
 *.app
 
 # Log path
+make_config.mk
 log/
-pikatests/
 lib/
 tools/
 output/

diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -14,6 +14,7 @@
 #include <sstream>
 #include <iostream>
 #include <iterator>
+#include <ctime>
 #include "env.h"
 #include "rsync.h"
 #include "pika_server.h"

diff --git a/third/nemo b/third/nemo
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,8 +28,8 @@ @@
     *.app
     # Log path
+    make_config.mk
     log/
-    pikatests/
     lib/
     tools/
     output/
@@ Expand Down @@
+2 −0		.gitignore
+1 −1		3rdparty/nemo-rocksdb
+1 −1		include/nemo.h
+1 −1		src/nemo_bit.cc
+1 −0		src/nemo_hash.cc
+3 −3		src/nemo_kv.cc