Skip to content

Commit

Permalink
Merge branch '4.18' into 4.19
Browse files Browse the repository at this point in the history
  • Loading branch information
DaanHoogland committed Sep 23, 2024
2 parents 9df783c + d15a074 commit 00bb9ec
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
FROM ubuntu:22.04

MAINTAINER "Apache CloudStack" <[email protected]>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT" Author="Apache CloudStack <[email protected]>"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/Dockerfile.marvin
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
FROM python:2

MAINTAINER "Apache CloudStack" <[email protected]>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT" Author="Apache CloudStack <[email protected]>"

ENV WORK_DIR=/marvin

Expand Down
3 changes: 1 addition & 2 deletions tools/docker/Dockerfile.smokedev
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@

FROM ubuntu:16.04

MAINTAINER "Apache CloudStack" <[email protected]>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT"
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT" Author="Apache CloudStack <[email protected]>"

RUN apt-get -y update && apt-get install -y \
genisoimage \
Expand Down
2 changes: 1 addition & 1 deletion ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

FROM node:14-bullseye AS build

MAINTAINER "Apache CloudStack" <[email protected]>
LABEL Description="Apache CloudStack UI; Modern role-base progressive UI for Apache CloudStack"
LABEL Vendor="Apache.org"
LABEL License=ApacheV2
LABEL Version=0.5.0
LABEL Author="Apache CloudStack <[email protected]>"

WORKDIR /build

Expand Down
4 changes: 2 additions & 2 deletions ui/src/config/section/compute.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default {
return filters
},
columns: () => {
const fields = ['displayname', 'state', 'ipaddress']
const fields = ['name', 'state', 'ipaddress']
const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal',
{
memoryused: (record) => {
Expand Down Expand Up @@ -77,7 +77,7 @@ export default {
fields.push('zonename')
return fields
},
searchFilters: ['displayname', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
details: () => {
var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account',
Expand Down

0 comments on commit 00bb9ec

Please sign in to comment.