Commit Graph

2675 Commits

Author SHA1 Message Date
Charitha Goonetilleke
b7d5d12033 Merge branch 'master' into 'master'
Fix tenant creating issue

Closes #42

See merge request entgra/product-iots!27
2019-09-17 07:54:01 +00:00
lasanthaDLPDS
8c6f6eaa51 Fix tenant creating issue
This closes product-iots/issues#42
2019-09-17 11:49:20 +05:30
Dharmakeerthi Lasantha
e5d7761cef Merge branch 'newAPPM' into 'application-manager-new'
Sync with upstream master

See merge request entgra/product-iots!25
2019-09-13 03:05:30 +00:00
lasanthaDLPDS
e69499e247 Sync with upstream master 2019-09-13 07:53:54 +05:30
Dharmakeerthi Lasantha
219909f08d Merge branch 'master' into 'master'
Bump product version and dependency versions

See merge request entgra/product-iots!24
2019-09-12 16:55:55 +00:00
lasanthaDLPDS
c3489c5910 Bump app manager version 2019-09-12 07:35:58 +05:30
lasanthaDLPDS
778d8a8a2c Bump product version to 3.7.0 2019-09-06 19:15:48 +05:30
Dharmakeerthi Lasantha
7304091aae Merge branch 'master' into 'master'
Product iots Version bump

See merge request entgra/product-iots!22
2019-08-29 07:03:11 +00:00
sandarudr
2379f031fc Product iots Version bump 2019-08-26 16:51:16 +05:30
Dharmakeerthi Lasantha
e60208ffbb Merge branch 'newAPPM' into 'application-manager-new'
Merge with upstream

See merge request entgra/product-iots!21
2019-07-21 21:12:16 +00:00
lasanthaDLPDS
1c8defff2c Merge branch 'master' of gitlab.com:entgra/product-iots into newAPPM 2019-07-18 21:44:01 +05:30
Dharmakeerthi Lasantha
d3d7a03bb9 Merge branch 'remove-windows-feature' into 'master'
Remove windows related stuffs from bin.xml

See merge request entgra/product-iots!20
2019-07-18 06:03:50 +00:00
Saad Sahibjan
e2a70ba91e Remove windows related stuffs from bin.xml 2019-07-18 11:23:08 +05:30
lasanthaDLPDS
001dfa2688 Merge branch 'master' of gitlab.com:entgra/product-iots into newAPPM 2019-07-17 18:37:31 +05:30
lasanthaDLPDS
ff2ee90496 Merge with upstream master 2019-07-17 18:37:08 +05:30
Dharmakeerthi Lasantha
5f0543bf1c Merge branch 'remove-windows-feature' into 'master'
Remove windows features from product-iots

See merge request entgra/product-iots!19
2019-07-17 13:04:24 +00:00
Saad Sahibjan
b0038e8a6b Remove windows features from product-iots 2019-07-15 13:38:43 +05:30
Entgra Builder
6e951d721e [maven-release-plugin] prepare for next development iteration 2019-07-07 14:09:28 +00:00
Entgra Builder
8db7385cba [maven-release-plugin] prepare release v3.6.0-RC2 2019-07-07 14:09:22 +00:00
Ace
27bb93262e Merge branch 'master' of https://gitlab.com/entgra/product-iots 2019-07-07 18:43:27 +05:30
Ace
87336456f8 updating components for 3.6.0 release 2019-07-07 18:43:11 +05:30
Entgra Builder
a5859a646f [maven-release-plugin] prepare for next development iteration 2019-07-04 10:46:49 +00:00
Entgra Builder
5949fe392d [maven-release-plugin] prepare release v3.6.0-RC2 2019-07-04 10:46:44 +00:00
Ace
22e429baf3 resolving conflicts 2019-07-04 14:43:12 +05:30
Ace
2c61bb7596 updating component/plugins versions for 3.6.0 release 2019-07-04 14:37:51 +05:30
Ruwan Yatawara
ddf340abfa Update pom.xml 2019-07-04 05:41:03 +00:00
Ace
20173081d2 updating release note for 3.6.0 release 2019-07-04 11:08:31 +05:30
Ruwan Yatawara
e96b635fa8 Merge branch 'master' into 'master'
updating references to 3.5.0 release to 3.6.0

See merge request entgra/product-iots!17
2019-06-27 11:31:46 +00:00
Ace
e547aa6edd updating references to 3.5.0 release to 3.6.0 2019-06-26 13:23:03 +05:30
Dharmakeerthi Lasantha
60f3fc6d37 Merge branch 'newAPPM' into 'application-manager-new'
Merge with upstream master

See merge request entgra/product-iots!16
2019-06-17 15:57:44 +00:00
lasanthaDLPDS
389e851b6e Merge with upstream master 2019-06-17 20:39:51 +05:30
Dharmakeerthi Lasantha
004f78d598 Merge branch 'application-manager-new' into 'application-manager-new'
Pack new request handler feature to the server

See merge request entgra/product-iots!14
2019-06-17 11:18:52 +00:00
Ruwan Yatawara
8597453a77 Merge branch 'fix-iots-109' into 'master'
Add migration scripts for https://gitlab.com/entgra/product-iots/issues/109

See merge request entgra/product-iots!15
2019-06-17 09:14:13 +00:00
charitha
2567827693 Add migration scripts for https://gitlab.com/entgra/product-iots/issues/109 2019-06-17 14:37:45 +05:30
Madawa Soysa
8743b9ceaf Pack new request interceptor feature to the server
Fixes entgra/product-iots#104
2019-06-17 15:51:35 +10:00
Entgra Builder
d9521dc028 [maven-release-plugin] prepare for next development iteration 2019-06-04 00:31:22 +00:00
Entgra Builder
e2970e01da [maven-release-plugin] prepare release v3.6.0-RC1 2019-06-04 00:31:17 +00:00
Ace
893ed0b641 bumping devicemgt dependencies to latest 2019-06-03 22:54:45 +05:30
Entgra Builder
ac08674f31 [maven-release-plugin] prepare for next development iteration 2019-06-01 19:16:04 +00:00
Entgra Builder
d67acb752f [maven-release-plugin] prepare release v3.5.1-test 2019-06-01 19:15:58 +00:00
Ace
927e3bb353 increasing sever startup wait time in integration tests 2019-06-01 22:21:06 +05:30
Ace
326b13a4fa prolonging build time to mitigate build break 2019-06-01 20:26:14 +05:30
Ace
bfd3c6e25d Merge branch 'master' of https://gitlab.com/entgra/product-iots 2019-06-01 19:59:30 +05:30
Ace
a324c6c679 prolonging build time to mitigate build break 2019-06-01 19:59:15 +05:30
charitha
eea001106e Update versions 2019-06-01 13:23:58 +05:30
Ace
fd654848df updating components for 3.6.0 RC-1 2019-05-31 21:56:24 +05:30
Inosh Perara
bcfbe588cc Merge branch 'newAPPM' into 'application-manager-new'
Update gitlab-ci

See merge request entgra/product-iots!13
2019-05-24 01:11:55 +00:00
lasanthaDLPDS
bf90a38d15 Update gitlab-ci 2019-05-24 06:03:05 +05:30
Saad Sahibjan
ceada92c60 Merge branch 'newAPPM' into 'application-manager-new'
Merge with upstream master

See merge request entgra/product-iots!12
2019-05-23 09:32:13 +00:00
lasanthaDLPDS
3beed364d7 Merge with upstream master 2019-05-23 14:50:35 +05:30