Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display cluster resource usage on node list #194

Merged
merged 8 commits into from
Jan 9, 2019
Merged

Display cluster resource usage on node list #194

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
92cc7cb
node-resource component add
BennieMeng Jan 3, 2019
8980cf7
frontend: fix conflict
BennieMeng Jan 3, 2019
1687b28
Merge branch 'master' into feature/node-resource-usage
Jan 4, 2019
e2e11b4
Merge branch 'master' of github.com:Qihoo360/wayne into feature/node-…
BennieMeng Jan 4, 2019
ea05bfe
Merge branch 'feature/node-resource-usage' of github.com:BennieMeng/w…
BennieMeng Jan 4, 2019
4722f51
frontend: add show resource control
BennieMeng Jan 7, 2019
b859e89
Merge branch 'master' into feature/node-resource-usage
Jan 7, 2019
12ef8b9
Merge branch 'master' into feature/node-resource-usage
Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
frontend: fix conflict
  • Loading branch information
@BennieMeng
BennieMeng committed Jan 3, 2019
commit 8980cf77fb5ce6778a52d804bdaa9bdbb54eff21
2 changes: 1 addition & 1 deletion src/frontend/src/app/admin/kubernetes/node/node-resource/node-resource.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.box {
display: flex;
justify-content: space-between;
justify-content: space-around;
flex-wrap: wrap;
}
.nodeSummary{
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.