Commit Graph

2744 Commits

Author SHA1 Message Date
geethkokila
1036761de0 Updating the anonymization tool and versions to 3.3.0 2018-03-16 11:00:40 +05:30
charitha
518e7c6b95 Fix build failure 2018-03-16 10:59:07 +05:30
Charitha Goonetilleke
459a37d902
Merge pull request #1788 from charithag/master
Upgrade device management core version
2018-03-15 21:27:34 +00:00
charitha
f6eb63344a Upgrade device management core version 2018-03-16 02:36:40 +05:30
Charitha Goonetilleke
f0e0bc0dc2
Merge pull request #1787 from charithag/master
Fix integration pom product version
2018-03-15 18:35:57 +00:00
charitha
aebcb76936 Merge branch 'master' of https://github.com/wso2/product-iot-server 2018-03-16 00:04:08 +05:30
charitha
e8075e0b99 Fix integration pom product version 2018-03-16 00:02:28 +05:30
charitha
4f8dcaceb6 Fix integration pom product version 2018-03-16 00:00:25 +05:30
charitha
23b940eeae Fix integration pom product version 2018-03-15 23:56:42 +05:30
Kamidu Sachith Punchihewa
2c5949c1dd
Merge pull request #1786 from charithag/master
Upgrade device management core version
2018-03-15 23:45:47 +05:30
charitha
dd77fa6794 Merge branch 'master' of https://github.com/wso2/product-iot-server 2018-03-15 23:43:39 +05:30
charitha
b60251f9df Upgrade device management core version 2018-03-15 23:43:17 +05:30
Charitha Goonetilleke
2865c40fa5
Merge pull request #1785 from rasika/master
Update application-authentication.xml
2018-03-15 17:43:37 +00:00
Rasika Perera
ea5f9befa1
Update application-authentication.xml 2018-03-15 23:08:16 +05:30
Kamidu Sachith Punchihewa
062d57dfe8
Merge pull request #1784 from geethkokila/master
Update the components and GDPR tool
2018-03-15 22:01:56 +05:30
Geeth
8bbfc24207
Merge pull request #1783 from lasanthaDLPDS/master
Fixing App manager test failure
2018-03-15 22:01:43 +05:30
geethkokila
4f6bdf2a0d Resolve conflicts and update the GDPR tool 2018-03-15 21:59:17 +05:30
geethkokila
c1ec8e541f Merge branch 'master' of https://github.com/wso2/product-iots 2018-03-15 21:58:14 +05:30
lasantha
be6a089c34 Enable integration test cases 2018-03-15 21:48:39 +05:30
lasantha
2668903e8f Modify the app manager JMeter test case.
As a  result of GDPR compliance functionality, App manager JMeter test cases has to be changed. Hence modify the App manager logic in JMeter the test.
2018-03-15 21:45:46 +05:30
Charitha Goonetilleke
0159b62db5
Merge pull request #1781 from charithag/master
Upgrade feature versions
2018-03-15 10:51:38 +00:00
charitha
9760e83254 Upgrade feature versions 2018-03-15 15:26:04 +05:30
lasantha
1aecf47a14 Merge branch 'master' of https://github.com/wso2/product-iots 2018-03-15 14:30:46 +05:30
geethkokila
5349768a44 Merge branch 'master' of https://github.com/wso2/product-iots 2018-03-15 14:04:54 +05:30
geethkokila
3efdeb23c9 Resolving conflicts 2018-03-15 14:04:00 +05:30
WSO2 Builder
a0efa947ea [maven-release-plugin] prepare for next development iteration 2018-03-14 22:01:12 +00:00
WSO2 Builder
d078626f9a [maven-release-plugin] prepare release v3.3.0-rc1 2018-03-14 22:00:54 +00:00
Geeth
2f9faf5943
Merge pull request #1780 from lasanthaDLPDS/330-release
Bump analytics version
2018-03-15 03:10:32 +05:30
lasantha
45af026524 Bump siddhi version 2018-03-15 03:07:31 +05:30
lasantha
8e31f3c387 Bump carbon-analytics-common version 2018-03-15 02:59:45 +05:30
Geeth
6f9743a8f4
Merge pull request #1779 from madhawap/330-release
Merge 330-release branch with master
2018-03-15 02:58:03 +05:30
madhawap
95800df578 Merge branch 'master' into 330-release 2018-03-15 02:46:40 +05:30
Geeth
37232ccbd0
Merge pull request #1778 from lasanthaDLPDS/330-release
Modify load-spark-env-vars.sh and wso2server.sh
2018-03-15 02:35:50 +05:30
lasantha
b6be585c4a Bump Analytics version 2018-03-15 02:33:53 +05:30
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
2018-03-15 02:09:07 +05:30
Geeth
a13164a934
Merge pull request #1777 from lasanthaDLPDS/330-release
Fix IoTS analytics startup issue
2018-03-15 00:18:22 +05:30
lasantha
a224a9d16a Fix data folder path issue 2018-03-15 00:14:04 +05:30
lasantha
8276ce7dce Fix Analytics startup issue 2018-03-15 00:11:35 +05:30
Geeth
cfc7737bb4
Merge pull request #1776 from ruwany/330-release
Adding env. variables and bumping versions
2018-03-15 00:04:42 +05:30
Ruwan Yatawara
ee84635bd6 adding environment variables and bumping versions 2018-03-15 00:03:01 +05:30
Ruwan Yatawara
05f7c9d5e7 Merge branch '330-release' of https://github.com/wso2/product-iots into 330-release 2018-03-14 23:20:33 +05:30
Geeth
ded535f281
Merge pull request #1775 from ruwany/master
Adding env-variable to enable scopes sharing between apis
2018-03-14 20:59:48 +05:30
Ruwan Yatawara
df0a5bfaad Adding env-variable to enable scopes sharing between apis 2018-03-14 20:28:41 +05:30
Dharmakeerhi Lasantha
32367196be
Merge pull request #1774 from geethkokila/330-release
Update the scope validator
2018-03-14 20:03:32 +05:30
geethkokila
706f118bd3 Update the scope validator 2018-03-14 20:02:09 +05:30
Geeth
5fafe3d36e
Merge pull request #1773 from lasanthaDLPDS/330-release
Bump the APIM and carbon Kernel vrsions
2018-03-14 19:56:05 +05:30
lasantha
309757603d Bump the APIM and carbon Kernel vrsions 2018-03-14 19:48:40 +05:30
Ruwan Yatawara
c8f758efea Merge branch '330-release' of https://github.com/wso2/product-iots into 330-release 2018-03-14 14:18:10 +05:30
Ruwan Yatawara
14f1429f67 Merge branch '330-release' of https://github.com/geethkokila/product-iots into 330-release 2018-03-14 14:09:33 +05:30
Charitha Goonetilleke
b9588646f5
Merge pull request #1769 from charithag/330-release
Bump kernel version & removed web xml customizations
2018-03-14 08:22:51 +00:00