Commit Graph

2413 Commits

Author SHA1 Message Date
Rasika Perera
a8824e8bcb
Merge pull request #1798 from rasika/master
Enable compression in catalina-server.xml
2018-03-20 07:36:16 +05:30
Rasika Perera
150898fab4 Enable compression in catalina-server.xml
This commit enables the compression in tomcat. This was disabled due to
a gzip library issue in JDK.
2018-03-20 07:25:44 +05:30
Madawa Soysa
201b714245
Merge pull request #1740 from madawas/master
Add UI testcase to test policy view
2018-03-19 15:34:18 +05:30
WSO2 Builder
c66e41bc17 [maven-release-plugin] prepare for next development iteration 2018-03-16 15:09:34 +00:00
WSO2 Builder
3029df9b5d [maven-release-plugin] prepare release v3.3.0-rc2 2018-03-16 15:09:24 +00:00
Madhawa Perera
24795c33f2
Merge pull request #1794 from geethkokila/master
Update devicemgt version
2018-03-16 19:14:04 +05:30
geethkokila
ea7526d486 Update devicemgt version 2018-03-16 19:12:24 +05:30
Geeth
22d1257adb
Merge pull request #1793 from rasika/master
Update dependencies
2018-03-16 17:46:08 +05:30
Rasika Perera
6e69e2b6cd Update carbon-device-mgt and carbon-device-mgt-plugins 2018-03-16 16:19:11 +05:30
Rasika Perera
ea1c9e37f4 Update dependencies 2018-03-16 16:13:30 +05:30
Charitha Goonetilleke
9f79ec5ae4
Merge pull request #1792 from shavidissa/master
Updating the iOS app in the QSG
2018-03-16 07:47:17 +00:00
Shavindri Dissanayake
884212ee08 Merge branch 'master' of https://github.com/wso2/product-iots 2018-03-16 12:44:55 +05:30
Shavindri Dissanayake
b9faf01dd7 update the iOS app of the QSG 2018-03-16 12:43:42 +05:30
Madhawa Perera
1428fadafe
Merge pull request #1791 from charithag/master
Fix build failure
2018-03-16 11:42:29 +05:30
charitha
c2218164d4 Merge branch 'master' of https://github.com/wso2/product-iot-server 2018-03-16 11:40:50 +05:30
Charitha Goonetilleke
fde3c4219d
Merge pull request #1790 from geethkokila/master
Update the license text
2018-03-16 05:52:55 +00:00
geethkokila
3ebe89deac Update license text 2018-03-16 11:19:58 +05:30
charitha
1ea365028f Merge branch 'master' of https://github.com/wso2/product-iot-server 2018-03-16 11:03:35 +05:30
Charitha Goonetilleke
613d4ccc02
Merge pull request #1789 from geethkokila/master
Updating the anonymization tool and versions to 3.3.0
2018-03-16 05:32:59 +00:00
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