Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/loafle/overflow/crawler/mongo/MongoCrawler.java
#	src/test/resources/config/example.json
This commit is contained in:
snoop 2017-04-26 11:32:30 +09:00
commit eb8436f4f1

View File

@ -28,12 +28,10 @@
"memory.usage.mapped",
"memory.usage.mappedWithJournal"
],
"queryInfo": {
"query":"mem",
"dataBaseName":"admin",
"statusCommand":"serverStatus",
"parseDirection" : "col"
"statusCommand":"serverStatus"
},
"keys" : [
"bits",
@ -43,8 +41,6 @@
"mapped",
"mappedWithJournal"
]
}
]
}