Merge "Correct spelling error in function name"

author Yujun Zhang <zhang.yujunz@zte.com.cn>

Fri, 7 Oct 2016 08:54:23 +0000 (08:54 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 7 Oct 2016 08:54:23 +0000 (08:54 +0000)
author Yujun Zhang <zhang.yujunz@zte.com.cn>
Fri, 7 Oct 2016 08:54:23 +0000 (08:54 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 7 Oct 2016 08:54:23 +0000 (08:54 +0000)
diff --cc restful_server/db.py
Simple merge
diff --cc restful_server/qtip_server.py
Simple merge
author	Yujun Zhang <zhang.yujunz@zte.com.cn>
	Fri, 7 Oct 2016 08:54:23 +0000 (08:54 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 7 Oct 2016 08:54:23 +0000 (08:54 +0000)
		1	2
restful_server/db.py	patch \|	diff1 \|	diff2 \|	blob \| history
restful_server/qtip_server.py	patch \|	diff1 \|	diff2 \|	blob \| history