Commit Graph

2675 Commits

Author SHA1 Message Date
ayyoob
4e248659ed Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-14 13:23:59 +05:30
ayyoob
72b66504f4 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-14 13:23:48 +05:30
Ace
8890408f38 Optimizing server start up time when running integration tests 2017-06-14 12:37:46 +05:30
Geeth
74db12e08f Merge pull request #1006 from ruwany/master
Fixing test failure
2017-06-13 17:12:45 +05:30
Ace
a75f6bc12e Fixing test failure 2017-06-13 17:12:06 +05:30
Ruwan
5f8b74e94c Merge pull request #1001 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/1000.
2017-06-13 13:04:22 +05:30
sinthuja
6ac04eba48 Fixing https://github.com/wso2/product-iots/issues/1000. 2017-06-13 12:56:24 +05:30
Ruwan
fbf45f8f8f Merge pull request #999 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/522.
2017-06-13 12:20:52 +05:30
sinthuja
2fc5104043 Fixing https://github.com/wso2/product-iots/issues/522. 2017-06-13 12:19:13 +05:30
Ace
e6850a2b2b increasing timeout for test 2017-06-12 17:20:00 +05:30
ayyoob
8ddac1d037 merged with origin 2017-06-12 11:50:45 +05:30
Ayyoob Hamza
0710e92640 Merge pull request #996 from Megala21/test_case_fixes
Increasing the timeout in test cases
2017-06-12 10:41:24 +05:30
megala21
6b5d4bf05f Increasing the timeout 2017-06-10 23:46:24 +05:30
Amal Gunatilake
c71d6000d5 Merge pull request #995 from janakamarasena/master
Update CDM and Plugins version
2017-06-09 14:51:50 +05:30
Janak Amarasena
4347c9aca9 Update CDM and Plugins version 2017-06-09 14:47:53 +05:30
ayyoob
fcfd39f54d Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-08 14:45:36 +05:30
ayyoob
bcffd2d41e adding http push notification feature 2017-06-08 14:40:18 +05:30
Chatura Dilan
861f194e18 Merge pull request #993 from janakamarasena/new-auth-grant
Add new supported grant type
2017-06-07 16:47:35 +05:30
Janak Amarasena
c3ad20b18a Add new supported grant type 2017-06-07 14:26:29 +05:30
ayyoob
d4ff9da16d updated migration script 2017-06-06 11:01:16 +05:30
Megala Uthayakumar
38df008123 Merge pull request #707 from GDLMadushanka/master
CarbonServerManager class moved to IOTS from platform integration test tools
2017-06-06 10:55:50 +05:30
GDLMadushanka
d376a91745 JavaDocs added 2017-06-06 10:44:24 +05:30
GDLMadushanka
43d8dc38b1 Clean up code 2017-06-06 07:49:42 +05:30
GDLMadushanka
f94713b70a pom modified to version 2017-06-05 16:46:23 +05:30
GDLMadushanka
5c782a6c15 CarbonServerManager moved to IOTS from platform integration test tools 2017-06-05 16:40:45 +05:30
ayyoob
5785ee1072 intial commit for db migration from 3.0.0 - 3.1.0 2017-06-05 00:13:52 +05:30
ayyoob
12837efd6d renamed content validator type name 2017-06-04 06:53:21 +05:30
ayyoob
80ecba8528 migrated new kernel and mb version 2017-06-01 10:47:59 +05:30
Hasunie
1375b89a4c Merge pull request #497 from madhawap/master
Upgraded carbon.device.mgt and carbon.device.mgt.plugins versions
2017-05-30 11:41:53 +05:30
madhawap
e2108e5c29 Upgraded carbon.device.mgt and carbon.device.mgt.plugins versions
Upgraded the versions carbon.device.mgt.version to 2.0.69 and carbon.device.mgt.plugins.version to 3.0.37
2017-05-30 11:37:48 +05:30
ayyoob
1a5c3ab51f Merge branch 'master' of https://github.com/wso2/product-iots 2017-05-29 05:46:34 +05:30
ayyoob
2ed4b2dfb6 added default purge configuration 2017-05-29 05:45:55 +05:30
sinthuja
cadfba3c05 Merge pull request #483 from Megala21/test_case_fixes
Adding test cases for virtual fire-alarm
2017-05-23 14:55:18 +05:30
megala21
976bdb2292 Fixing issues 2017-05-23 12:03:05 +05:30
megala21
ee94b8ce8f Adding initial cut virtual fire-alarm policy publish scenario 2017-05-23 01:42:11 +05:30
megala21
1aadd2b171 Adding initial test cases for virtual fire alarm 2017-05-21 01:07:10 +05:30
sinthuja
fa21f8cfd6 Merge pull request #453 from Megala21/test_case_fixes
Adding test cases for android sense and mobile-qsg script execution.
2017-05-17 11:47:00 +05:30
megala21
70763e42c2 Merge remote-tracking branch 'upstream/master' into test_case_fixes 2017-05-16 20:21:00 +05:30
megala21
1178869ef3 Updating versions 2017-05-16 20:20:55 +05:30
Ayyoob Hamza
5334745d0b Merge pull request #448 from sinthuja/test-merge
Removing some unnecessary features from the profiles.
2017-05-16 16:21:02 +05:30
sinthuja
b2495ad414 Fixing the formatting issue. 2017-05-16 15:23:44 +05:30
sinthuja
52fb2f732f Fixing the formatting issue. 2017-05-16 15:22:14 +05:30
sinthuja
df48dbd3c0 Fixing the formatting issue. 2017-05-16 15:18:42 +05:30
sinthuja
955294135a Moving the config files to the key manager profile. 2017-05-16 15:08:14 +05:30
sinthuja
28cc40db78 Removing unwanted features from profiles. 2017-05-16 15:01:16 +05:30
megala21
974a113ac3 Resolving conflicts 2017-05-16 14:39:17 +05:30
megala21
8ee4c2dbba Adding test cases for quick start guide 2017-05-16 14:36:11 +05:30
sinthuja
022f11468f Merge pull request #442 from Megala21/master
Fixing test case failure
2017-05-16 10:10:48 +05:30
megala21
8cd51b41c3 Merge remote-tracking branch 'upstream/master' 2017-05-16 10:08:57 +05:30
megala21
2338043eee Fixing test case failure 2017-05-16 10:08:13 +05:30