This is an automated email from the ASF dual-hosted git repository.

shwstppr pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit d1707009f6b77865137ead56581ce3cf755d3ff0
Merge: 6886fca1050 55e35c6e0c3
Author: Abhishek Kumar <[email protected]>
AuthorDate: Tue Apr 11 15:32:20 2023 +0530

    Merge remote-tracking branch 'apache/4.17' into 4.18

 ui/src/config/section/network.js  | 3 +--
 ui/src/core/lazy_lib/icons_use.js | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc ui/src/core/lazy_lib/icons_use.js
index 6f4fd0731c3,2465994e575..ec2d67deaf9
--- a/ui/src/core/lazy_lib/icons_use.js
+++ b/ui/src/core/lazy_lib/icons_use.js
@@@ -160,10 -155,9 +160,11 @@@ import 
    UserDeleteOutlined,
    UsergroupDeleteOutlined,
    UserOutlined,
+   UserSwitchOutlined,
    UploadOutlined,
 -  WifiOutlined
 +  WarningOutlined,
 +  WifiOutlined,
 +  SolutionOutlined
  } from '@ant-design/icons-vue'
  import renderIcon from '@/utils/renderIcon'
  
@@@ -313,10 -302,9 +314,11 @@@ export default 
      app.component('UserDeleteOutlined', UserDeleteOutlined)
      app.component('UsergroupDeleteOutlined', UsergroupDeleteOutlined)
      app.component('UserOutlined', UserOutlined)
+     app.component('UserSwitchOutlined', UserSwitchOutlined)
      app.component('UploadOutlined', UploadOutlined)
 +    app.component('WarningOutlined', WarningOutlined)
      app.component('WifiOutlined', WifiOutlined)
      app.component('renderIcon', renderIcon)
 +    app.component('SolutionOutlined', SolutionOutlined)
    }
  }

Reply via email to