Merge "bugfix: query doesn't work well with period=1"

author Serena Feng <feng.xiaowei@zte.com.cn>

Wed, 19 Jul 2017 09:47:59 +0000 (09:47 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 19 Jul 2017 09:47:59 +0000 (09:47 +0000)
author Serena Feng <feng.xiaowei@zte.com.cn>
Wed, 19 Jul 2017 09:47:59 +0000 (09:47 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 19 Jul 2017 09:47:59 +0000 (09:47 +0000)
diff --cc utils/test/testapi/opnfv_testapi/resources/result_handlers.py
Simple merge
diff --cc utils/test/testapi/opnfv_testapi/tests/unit/resources/test_result.py
Simple merge
author	Serena Feng <feng.xiaowei@zte.com.cn>
	Wed, 19 Jul 2017 09:47:59 +0000 (09:47 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 19 Jul 2017 09:47:59 +0000 (09:47 +0000)
		1	2
utils/test/testapi/opnfv_testapi/resources/result_handlers.py	patch \|	diff1 \|	diff2 \|	blob \| history
utils/test/testapi/opnfv_testapi/tests/unit/resources/test_result.py	patch \|	diff1 \|	diff2 \|	blob \| history