nicolargo / glances

40%

master: 40%

LAST BUILD ON BRANCH v3.1.0

branch: v3.1.0

CHANGE BRANCH

x

Reset

• v3.1.0
• develop
• feature/issue403
• master
• v2.1
• v2.1.1
• v2.1.2
• feature/issue418
• v2.2
• feature/issue447
• v2.2.1
• feature/issue463
• feature/issue455
• feature/issue132
• feature/issue440
• feature/issue480
• v2.3
• revert-580-master
• v2.4
• v2.4.1
• v2.4.2
• v2.5
• v2.5.1
• compat
• core
• revert-742-travis-os
• docs
• v2.6
• v2.6.1
• issue780
• v2.6.2
• issue865
• v2.7_RC1
• v2.7
• v2.7.1
• v2.7.1_1
• v2.8
• v2.8.1
• v2.8.1_1
• v2.8.2
• issue1018
• v2.8.4
• v2.8.5
• v2.8.6
• v2.8.7
• v2.8.8
• v2.9.0
• v2.9.1
• v2.10
• revert-1098-feature/change-def-username-realm
• issue1121
• v2.11
• release/glances2
• v2.11.1
• issue1182
• add-code-of-conduct-1
• revert-1237-feature/webpack
• master-2.x
• v3.0
• v3.0.1
• v3.0.2
• issue1446
• v3.1.1
• v3.1.2
• issue1526
• issue1547
• issue1523
• issue1523reset
• issue1561
• v3.1.4
• v3.1.4.1
• issue1444
• v3.1.5
• dependabot/npm_and_yarn/glances/outputs/static/macaddress-0.2.9
• dependabot/npm_and_yarn/glances/outputs/static/lodash-4.17.19
• dependabot/npm_and_yarn/glances/outputs/static/elliptic-6.5.3
• dependabot/npm_and_yarn/glances/outputs/static/fstream-1.0.12
• dependabot/npm_and_yarn/glances/outputs/static/sshpk-1.16.1
• dependabot/npm_and_yarn/glances/outputs/static/stringstream-0.0.6
• dependabot/npm_and_yarn/glances/outputs/static/angular-1.8.0
• issue1733
• issue1734
• webui-amp-disable-number-matching-processes
• webui-sort-by-disk-io
• v3.1.6
• v3.1.6.1
• issue1714
• v3.1.6.2
• dependabot/npm_and_yarn/glances/outputs/static/y18n-3.2.2
• issue1850

Build # 2752

Build Type

push

travis-ci

Committed by nicolargo

Commit Message

Resolve merge conflict with master branch

Run Details

2170 of 5485 relevant lines covered (39.56%)

1.98 hits per line