From 327607e86d4d06561bcf9fcf92f3bcef6409de28 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 16 Aug 2021 18:27:53 +0300
Subject: [PATCH 1/2] Update versions to 3.3.1 in package.json

---
 msa/js-executor/package.json | 2 +-
 msa/web-ui/package.json      | 2 +-
 ui-ngx/package.json          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/msa/js-executor/package.json b/msa/js-executor/package.json
index 187144da20..6da7852a3a 100644
--- a/msa/js-executor/package.json
+++ b/msa/js-executor/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-js-executor",
   "private": true,
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "ThingsBoard JavaScript Executor Microservice",
   "main": "server.js",
   "bin": "server.js",
diff --git a/msa/web-ui/package.json b/msa/web-ui/package.json
index 3897c31f5e..05d1f26bf7 100644
--- a/msa/web-ui/package.json
+++ b/msa/web-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-web-ui",
   "private": true,
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "ThingsBoard Web UI Microservice",
   "main": "server.js",
   "bin": "server.js",
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 823045e0b9..9d2be6658f 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thingsboard",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "scripts": {
     "ng": "ng",
     "start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --host 0.0.0.0 --open",

From 54bed0e5d8c709bdb084d0e3c51dafdf03873af7 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 17 Aug 2021 19:07:04 +0300
Subject: [PATCH 2/2] Edge functionality enabled by default

---
 application/src/main/resources/thingsboard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 74572e8ccc..c654c0c3cf 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -699,7 +699,7 @@ transport:
 
 # Edges parameters
 edges:
-  enabled: "${EDGES_ENABLED:false}"
+  enabled: "${EDGES_ENABLED:true}"
   rpc:
     port: "${EDGES_RPC_PORT:7070}"
     client_max_keep_alive_time_sec: "${EDGES_RPC_CLIENT_MAX_KEEP_ALIVE_TIME_SEC:300}"