caicloud / nirvana / 591
46%

DEFAULT BRANCH: master
Ran
Jobs 2
Files 69
Run time 51s
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
591

push

travis-ci

caicloud-bot 
fix(service): fix wrong conflict definition check (#199)

Automatic merge from submit-queue.

fix(service): fix wrong conflict definition check

**What this PR does / why we need it**:

Fix wrong conflict definition check

**Which issue(s) this PR fixes** *(optional, close the issue(s) when PR gets merged)*:

Fixes #198

**Special notes for your reviewer**:

/cc @zjj2wry 

**Release note**:


```release-note
NONE
```

<!--  Thanks for sending a pull request! Here are some tips:

1. https://github.com/caicloud/engineering/blob/master/docs/review_conventions.md  <-- what is the review process looks like
2. https://github.com/caicloud/engineering/blob/master/docs/commit_conventions.md  <-- how to structure your git commit
3. https://github.com/caicloud/engineering/blob/master/docs/caicloud_bot.md        <-- how to work with caicloud bot

Other tips from Kubernetes cmomunity:

1. If this is your first time, read our contributor guidelines https://git.k8s.io/community/contributors/devel/pull-requests.md#the-pr-submit-process and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide
2. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/devel/pull-requests.md#best-practices-for-faster-reviews
3. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/devel/pull-requests.md#write-release-notes-if-needed
4. If the PR is unfinished, see how to mark it: https://github.com/kubernetes/community/blob/master/contributors/devel/pull-requests.md#marking-unfinished-pull-requests
-->

3120 of 5348 relevant lines covered (58.34%)

71.6 hits per line

Jobs
ID Job ID Ran Files Coverage
1 591.1 0
58.34
 Travis Job 591.1
2 591.2 0
58.34
 Travis Job 591.2
Source Files on build 591
Detailed source file information is not available for this build.