Merge pull request #28 from Telecominfraproject/fix/wifi-9646--git-merge-conflict

[WIFI-9646] Fix: git merge conflict
2025-10-29 17:52:28 +00:00 · 2022-06-17 17:46:07 +03:00 · 2022-06-17 17:27:31 +03:00 · 2022-06-17 13:39:27 +00:00 · 2022-06-15 17:53:47 -07:00 · 2022-06-15 17:21:59 -07:00
2 changed files with 2 additions and 2 deletions
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
  owprov:
    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owprov
-    tag: main
+    tag: v2.6.0-RC2
    pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
--- a/src/framework/ConfigurationValidator.cpp
+++ b/src/framework/ConfigurationValidator.cpp
@@ -14,7 +14,7 @@
 namespace OpenWifi {

 static const std::string GitUCentralJSONSchemaFile{
-	"https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json"};
+		"https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json"};

 static json DefaultUCentralSchema = R"(
Author	SHA1	Message	Date
Dmitry Dunaev	80d5ae340f	Merge pull request #28 from Telecominfraproject/fix/wifi-9646--git-merge-conflict [WIFI-9646] Fix: git merge conflict	2022-06-17 17:46:07 +03:00
Dmitry Dunaev	265ae7483b	[WIFI-9646] Fix: git merge conflict Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>	2022-06-17 17:27:31 +03:00
TIP Automation User	43c4ad2211	Chg: update image tag in helm values to v2.6.0-RC2	2022-06-17 13:39:27 +00:00
Stephane Bourque	5cccd0b797	Merge pull request #27 from Telecominfraproject/WIFI-9616 Wifi 9616	2022-06-15 17:53:47 -07:00
stephb9959	b8bcece4bf	Adding new configuration validator Signed-off-by: stephb9959 <stephane.bourque@gmail.com>	2022-06-15 17:21:59 -07:00
Dmitry Dunaev	3132b964bd	Merge pull request #26 from Telecominfraproject/fix/wifi-9174--dep-charts-2.6 [WIFI-9174] Fix: switch from deprecated bitnami charts to mirrored ones	2022-06-03 19:27:31 +03:00
Dmitry Dunaev	711dc59fa6	[WIFI-9174] Fix: switch from deprecated bitnami charts to mirrored ones Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>	2022-06-03 19:27:02 +03:00
Stephane Bourque	82fbfeebc6	Merge pull request #23 from Telecominfraproject/WIFI8096 Fixing: https://telecominfraproject.atlassian.net/browse/WIFI-8096	2022-05-26 23:51:59 -07:00
stephb9959	77a4df5221	Fixing: https://telecominfraproject.atlassian.net/browse/WIFI-8096 Signed-off-by: Stephane Bourque <stephane.bourque@arilia.com>	2022-05-26 23:43:05 -07:00
TIP Automation User	c749275ef8	Chg: update image tag in helm values to v2.6.0-RC1	2022-05-23 12:55:15 +00:00