geethkokila
|
c1ec8e541f
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
7 years ago |
Charitha Goonetilleke
|
0159b62db5
|
Merge pull request #1781 from charithag/master
Upgrade feature versions
|
7 years ago |
charitha
|
9760e83254
|
Upgrade feature versions
|
7 years ago |
|
geethkokila
|
5349768a44
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
7 years ago |
|
geethkokila
|
3efdeb23c9
|
Resolving conflicts
|
7 years ago |
WSO2 Builder
|
a0efa947ea
|
[maven-release-plugin] prepare for next development iteration
|
7 years ago |
|
WSO2 Builder
|
d078626f9a
|
[maven-release-plugin] prepare release v3.3.0-rc1
|
7 years ago |
|
Geeth
|
2f9faf5943
|
Merge pull request #1780 from lasanthaDLPDS/330-release
Bump analytics version
|
7 years ago |
lasantha
|
45af026524
|
Bump siddhi version
|
7 years ago |
|
lasantha
|
8e31f3c387
|
Bump carbon-analytics-common version
|
7 years ago |
|
Geeth
|
6f9743a8f4
|
Merge pull request #1779 from madhawap/330-release
Merge 330-release branch with master
|
7 years ago |
madhawap
|
95800df578
|
Merge branch 'master' into 330-release
|
7 years ago |
|
Geeth
|
37232ccbd0
|
Merge pull request #1778 from lasanthaDLPDS/330-release
Modify load-spark-env-vars.sh and wso2server.sh
|
7 years ago |
|
lasantha
|
b6be585c4a
|
Bump Analytics version
|
7 years ago |
|
lasantha
|
397cae3ed9
|
Modify load-spark-env-vars.sh and wso2server.sh
In order to fix analytics spark isssue added environmental variables to the load-spark-env-vars.sh and wso2server.sh
|
7 years ago |
|
Geeth
|
a13164a934
|
Merge pull request #1777 from lasanthaDLPDS/330-release
Fix IoTS analytics startup issue
|
7 years ago |
|
lasantha
|
a224a9d16a
|
Fix data folder path issue
|
7 years ago |
|
lasantha
|
8276ce7dce
|
Fix Analytics startup issue
|
7 years ago |
|
Geeth
|
cfc7737bb4
|
Merge pull request #1776 from ruwany/330-release
Adding env. variables and bumping versions
|
7 years ago |
Ruwan Yatawara
|
ee84635bd6
|
adding environment variables and bumping versions
|
7 years ago |
|
Ruwan Yatawara
|
05f7c9d5e7
|
Merge branch '330-release' of https://github.com/wso2/product-iots into 330-release
|
7 years ago |
|
Geeth
|
ded535f281
|
Merge pull request #1775 from ruwany/master
Adding env-variable to enable scopes sharing between apis
|
7 years ago |
|
Ruwan Yatawara
|
df0a5bfaad
|
Adding env-variable to enable scopes sharing between apis
|
7 years ago |
|
Dharmakeerhi Lasantha
|
32367196be
|
Merge pull request #1774 from geethkokila/330-release
Update the scope validator
|
7 years ago |
|
geethkokila
|
706f118bd3
|
Update the scope validator
|
7 years ago |
|
Geeth
|
5fafe3d36e
|
Merge pull request #1773 from lasanthaDLPDS/330-release
Bump the APIM and carbon Kernel vrsions
|
7 years ago |
|
lasantha
|
309757603d
|
Bump the APIM and carbon Kernel vrsions
|
7 years ago |
|
Ruwan Yatawara
|
c8f758efea
|
Merge branch '330-release' of https://github.com/wso2/product-iots into 330-release
|
7 years ago |
|
Ruwan Yatawara
|
14f1429f67
|
Merge branch '330-release' of https://github.com/geethkokila/product-iots into 330-release
|
7 years ago |
|
Charitha Goonetilleke
|
b9588646f5
|
Merge pull request #1769 from charithag/330-release
Bump kernel version & removed web xml customizations
|
7 years ago |
|
charitha
|
da9fb48815
|
Merge branch '330-release' of https://github.com/wso2/product-iot-server into 330-release
# Conflicts:
# modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml
|
7 years ago |
|
Geeth
|
dece71d0c8
|
Merge pull request #1770 from ruwany/330-release
Adding identity-consent mgt configs and changing login redirection page
|
7 years ago |
|
Ruwan Yatawara
|
88256979dd
|
Adding identity-consent mgt configs and changing login redirection page
|
7 years ago |
|
charitha
|
aa19cccfe8
|
Bump kernel version & removed web xml customizations
|
7 years ago |
|
Charitha Goonetilleke
|
99f32bb35e
|
Merge pull request #1767 from geethkokila/330-release
Add GDPR Compliance
|
7 years ago |
|
geethkokila
|
d51ce8e6fa
|
Fix git conflits
|
7 years ago |
|
geethkokila
|
6ac2f958d8
|
Fixing the conflict
|
7 years ago |
|
Geeth
|
c8c42f600b
|
Merge pull request #1765 from charithag/master
Fix issues in broker startup
|
7 years ago |
|
charitha
|
f1d1285dfa
|
Merge branch '330-release' of https://github.com/wso2/product-iot-server
# Conflicts:
# pom.xml
|
7 years ago |
|
charitha
|
4d542831c0
|
Bump analytics commons version
|
7 years ago |
|
Charitha Goonetilleke
|
658665cfeb
|
Merge pull request #1764 from geethkokila/330-release
Update component versions
|
7 years ago |
|
Geeth
|
f1153c9194
|
Merge pull request #4 from ruwany/geethkokila-330-release-new
resolving issues with consent management
|
7 years ago |
|
charitha
|
6e35345f28
|
Fix issue in broker startup
|
7 years ago |
|
Geeth
|
e5f4fc6ed9
|
Merge pull request #6 from Kamidu/release-330-geeth
Update app mgt version
|
7 years ago |
kamidu
|
7f8d57b7dc
|
Update app mgt version
Update the app mgt version to retrive all the OAEP fixes
|
7 years ago |
|
Ruwan Yatawara
|
aad64c4813
|
resolving issues with consent management
|
7 years ago |
|
geethkokila
|
3234b776d6
|
Update the message broker and kernel versions
|
7 years ago |
|
Geeth
|
f9368a9f23
|
Merge pull request #3 from ruwany/geethkokila-330-release-new
Correcting parent id
|
7 years ago |
|
Ruwan Yatawara
|
b9053cffd3
|
correcting version
|
7 years ago |
|
Ruwan Yatawara
|
b26e9166bd
|
Correcting parent id
|
7 years ago |
