This is an automated email from the ASF dual-hosted git repository. tianxiaoliang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-kie.git
commit 674592695778b42a5704bc1cfe4a5533e3bc8370 Merge: 6e9a59f bf3c4d6 Author: Mohammad Asif Siddiqui <mohammad.asif.siddiq...@huawei.com> AuthorDate: Thu Jun 27 17:23:06 2019 +0530 Merge pull request #13 from tianxiaoliang/master SCB-1320 support combination query go.mod | 5 +- pkg/common/common.go | 3 +- server/config/config.go | 4 +- server/dao/kie_api.go | 24 ++++-- server/dao/kv_test.go | 8 +- server/resource/v1/common.go | 34 +++++++-- server/resource/v1/common_test.go | 64 ++++++++++++++++ server/resource/v1/doc_struct.go | 14 ++-- server/resource/v1/kv_resource.go | 89 +++++++++------------- .../resource/v1/v1_suite_test.go | 21 +++-- 10 files changed, 171 insertions(+), 95 deletions(-)