From a6f40c325fd41c53a9ac1fdd35b2143c81cc35be Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 12 Jan 2021 11:48:13 -0500 Subject: [PATCH 1/6] set ziti-monitor to automatic - delayed start --- Installer/ZitiDesktopEdge.aip | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index c998a6ce..4b961126 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -299,6 +299,9 @@ + + + From 2c654ebedab14327c6e923968333da7308c5dff2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 12 Jan 2021 17:02:26 +0000 Subject: [PATCH 2/6] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index ab1ba4e2..1e7b7fed 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.6.27" - Revision = "894c0b0b0222" - Branch = "release-1.6.27" + Revision = "a6f40c325fd4" + Branch = "release-1.6.28" BuildUser = "" - BuildDate = "2021-01-11 14:21:24" + BuildDate = "2021-01-12 16:54:51" ) From 7fe0f948ba92ba11864e862313163f254bba1f26 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 12 Jan 2021 13:36:22 -0500 Subject: [PATCH 3/6] missing updating the version :( --- release-notes.md | 14 ++++++++++++++ version | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 65abc833..e6b5df91 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,17 @@ +# Release 1.6.28 + +## What's New +* ziti-monitor service set to "Automatic (Delayed Start)". Some users have noticed the monitor service does not start + +## Other changes: +* none + +## Bugs fixed: +* none + +## Dependency Updates +* none + # Release 1.6.27 (also: 1.6.25, 1.6.26) ## What's New diff --git a/version b/version index 8bfaa5be..10010a4b 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.6.27 +1.6.28 From 23f770fd3902b74e61dc01811190c6cec94f7202 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 12 Jan 2021 13:50:01 -0500 Subject: [PATCH 4/6] how did 'ziti-monitor' change to 'op'... --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 6 +++--- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 1916cc04..47026af6 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyFileVersion("1.6.27.0")] +// [assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyFileVersion("1.6.28.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 4b961126..45e5fc0d 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -22,10 +22,10 @@ - + - + @@ -300,7 +300,7 @@ - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index f54eb200..f107a650 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyFileVersion("1.6.27.0")] +// [assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyFileVersion("1.6.28.0")] From a441b72f7911bf14b08735c685b994b30667e507 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 12 Jan 2021 18:50:56 +0000 Subject: [PATCH 5/6] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- service/ziti-tunnel/version.go | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 1916cc04..47026af6 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyFileVersion("1.6.27.0")] +// [assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyFileVersion("1.6.28.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 4b961126..5819fc82 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -22,10 +22,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index f54eb200..f107a650 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyVersion("1.6.27.0")] -[assembly: AssemblyFileVersion("1.6.27.0")] +// [assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyVersion("1.6.28.0")] +[assembly: AssemblyFileVersion("1.6.28.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 1e7b7fed..3551fcdb 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.6.27" - Revision = "a6f40c325fd4" + Version = "1.6.28" + Revision = "32a176893815" Branch = "release-1.6.28" BuildUser = "" - BuildDate = "2021-01-12 16:54:51" + BuildDate = "2021-01-12 18:42:46" ) From 53be6d5ddc3665cb20ae0a442b2ca2e62444470d Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 12 Jan 2021 19:05:25 +0000 Subject: [PATCH 6/6] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 3551fcdb..e867bd6e 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.6.28" - Revision = "32a176893815" + Revision = "848677341846" Branch = "release-1.6.28" BuildUser = "" - BuildDate = "2021-01-12 18:42:46" + BuildDate = "2021-01-12 18:58:32" )