Merge branch 'dev'

seonghoon-jeong · seonghoon-jeong · commit c3e9c1fbdd8f · 2020-11-26T14:58:49.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v4.1.6 (2020.11.26)
+### Features
+ - No changes
+ 
+### Fixes
+ - hypercloud 재설치 경우, admin user 로그인 안되는 현상 수정 (IMS: 245904)
+ - rook-ceph 설치 화면에서, cpu,memory 설정 시, 선택한 disk 초기화 되는 현상 수정
+ - Tekton CI/CI Template version 수정 (4.1.4.6 -> 1.1.5)
+
+---
+
 # v4.1.5 (2020.11.19)
 ### Features
  - Install Page 검색 기능 추가
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hypercloud-installer",
   "productName": "HyperCloud Installer",
-  "version": "v4.1.5",
+  "version": "v4.1.6",
   "description": "HyperCloud Installer Application (Electron application boilerplate based on React, React Router, Webpack, React Hot Loader for rapid application development)",
   "main": "./main.prod.js",
   "author": {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hypercloud-installer",`
`3`	`3`	`"productName": "HyperCloud Installer",`
`4`		`- "version": "v4.1.5",`
	`4`	`+ "version": "v4.1.6",`
`5`	`5`	`"description": "HyperCloud Installer Application (Electron application boilerplate based on React, React Router, Webpack, React Hot Loader for rapid application development)",`
`6`	`6`	`"main": "./main.prod.js",`
`7`	`7`	`"author": {`