Commit Graph

1641 Commits

Author SHA1 Message Date
Charitha Goonetilleke
227dcdb65a Merge pull request #1344 from harshanL/master
This includes fixes for wso2/product-iots#1293
2017-08-29 13:17:48 +05:30
Harshan Liyanage
5fd140e523 This includes fixes for wso2/product-iots#1293 2017-08-29 13:11:11 +05:30
Dileesha Rajapakse
ca66602fa6 Fixed typos in conf files 2017-08-29 12:03:32 +05:30
Dileesha Rajapakse
1b402be22d Merge branch 'master' of https://github.com/wso2/product-iots 2017-08-29 11:58:00 +05:30
Dileesha Rajapakse
13b4eda1c8 Fixing product-iots#1236
Fixed https://github.com/wso2/product-iots/issues/1236
2017-08-29 11:57:49 +05:30
Nirothipan
bb68e6d59c redirecting default url from cabon home to devicemgt 2017-08-28 18:58:02 +05:30
geethkokila
f390f3695d Fixing the instrumentations dependencies 2017-08-28 12:04:55 +05:30
WSO2 Builder
224ae5a7f6 [maven-release-plugin] prepare for next development iteration 2017-08-23 05:55:38 +00:00
WSO2 Builder
667a23c03f [maven-release-plugin] prepare release v3.1.0-update1 2017-08-23 05:54:14 +00:00
Ace
d50986b6ac Correcting kernel version 2017-08-23 10:35:43 +05:30
Milan Perera
975da56316 prepare for next development iteration 2017-08-18 10:13:48 +05:30
Kamidu Sachith Punchihewa
af1e9ace45 Merge pull request #1294 from sameerawickramasekara/master
New sample device type from Java code
2017-08-16 11:27:09 +05:30
Sameera Wickramasekara
6b4f3d0373 Trim deviceId to remove extra spaces 2017-08-14 17:41:41 +05:30
Sameera Wickramasekara
273cb989d4 Add new device type sampledevice 2017-08-14 17:17:57 +05:30
Sameera Wickramasekara
7450910748 remove raspberrypicodebased devicetype 2017-08-14 17:15:51 +05:30
WSO2 Builder
e7706289ff [maven-release-plugin]prepare for next development iteration 2017-08-11 09:56:41 +00:00
WSO2 Builder
526a8b95f3 [maven-release-plugin]prepare release v3.1.0-RC4 2017-08-11 09:55:17 +00:00
Sameera Wickramasekara
ed0b110ad6 Fix code formatting 2017-08-11 11:35:58 +05:30
WSO2 Builder
682babe830 [maven-release-plugin]prepare for next development iteration 2017-08-10 22:47:42 +05:30
WSO2 Builder
4b85767d39 [maven-release-plugin]prepare release v3.1.0-RC4 2017-08-10 22:47:28 +05:30
Milan Perera
1b7c7860d7 Modified change-ip script
change-ip script has been modified to use same keystores across all three profiles in order to support carbon level server to server authentication
2017-08-10 18:51:33 +05:30
Sameera Wickramasekara
3d359642bf Add new raspberrypicodebased device type to samples 2017-08-10 16:56:40 +05:30
Ouerghi Yassine
0f91ebfb3f Update change-ip.sh 2017-08-10 02:15:13 +01:00
warunalakshitha
a9a1b2c066 Merge branch 'master' of https://github.com/wso2/product-iots into remote-control 2017-08-09 18:24:05 +05:30
Madhawa Perera
f400cc417e Merge pull request #1282 from milanperera/iot-master
Modified change-ip script
2017-08-09 14:21:14 +05:30
warunalakshitha
8513714247 Merge branch 'master' of https://github.com/wso2/product-iots into remote-control 2017-08-09 12:15:35 +05:30
warunalakshitha
253b5faac5 add remote session control feature to product 2017-08-09 12:08:47 +05:30
Milan Perera
5075019288 Modified change-ip script
Change analytics and broker's ip/domain through carbon.xml
2017-08-09 11:36:52 +05:30
lasantha
20a7f5685f improving text arrangement in 'change-ip.sh' script 2017-08-08 12:17:53 +05:30
lasantha
74aec0eb54 improving change-ip.sh script 2017-08-07 09:55:23 +05:30
Milan Perera
907ab4b87d Added jwt public cert to client truststore from the change-ip scipt 2017-08-06 23:03:54 +05:30
Milan Perera
089cf7fa5d Merge remote-tracking branch 'upstream/master' into iot-master 2017-08-03 18:51:30 +05:30
sameera910409
d5eb514271 fixes https://github.com/wso2/product-iots/issues/1268 : [H2 / Analytics] Identity/h2.sql script is missing in analytics profile 2017-08-03 16:54:40 +05:30
WSO2 Builder
2ce8881cbc [maven-release-plugin]prepare for next development iteration 2017-08-03 13:43:12 +05:30
WSO2 Builder
4003c98a45 [maven-release-plugin]prepare release v3.1.0-RC4 2017-08-03 13:42:58 +05:30
Milan Perera
196ad6620b Modifying change-ip script
Added few commands to the script
2017-08-03 11:56:19 +05:30
Milan Perera
b571216208 Added JWT keystore to the script
In order to start servers after doing IP changes, it is required to create new keystore for JWT signing and verification. So this fix adds that keystore generating logic to the bash script
2017-08-02 16:14:10 +05:30
lasantha
08245bd329 Adding ip configurating script 2017-08-02 09:18:18 +05:30
lasantha
6008097712 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-31 10:52:23 +05:30
Rasika Perera
e3182a9d03 Fixing https://github.com/wso2/product-iots/issues/1193 2017-07-28 18:05:57 +05:30
WSO2 Builder
7ab7424707 [maven-release-plugin]prepare for next development iteration 2017-07-27 03:40:17 +05:30
WSO2 Builder
8501c22568 [maven-release-plugin]prepare release v3.1.0-RC3 2017-07-27 03:40:03 +05:30
lasantha
b25430132b Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-26 20:33:21 +05:30
Madhawa Perera
55c3c942bb Merge pull request #1228 from wso2/shavidissa-patch-2
Update README
2017-07-26 18:58:18 +05:30
madhawap
a1ca2f6a43 Modifications to QSG executor 2017-07-26 10:13:11 +05:30
madhawap
ebc039b520 Removed change-ip.sh from bin.xml 2017-07-26 08:45:00 +05:30
Madhawa Perera
cc9246ae4a Merge pull request #1227 from wso2/shavidissa-patch-1
Update release-notes.html
2017-07-26 06:51:43 +05:30
madhawap
dd13b37443 Added license.txt 2017-07-26 06:32:48 +05:30
Rasika Perera
9ddae03239 Temporary overriding default keystores and truststores from kernel v4.4.17 due to DATE expiration. Remove these once Kernel v4.4.17 is released. 2017-07-26 00:21:53 +05:30
lasantha
8c99d3c0e3 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-25 19:50:45 +05:30
shavidissa
9b0b5ee8c4 Update README 2017-07-25 17:54:07 +05:30
shavidissa
d0d88c35b3 Update release-notes.html 2017-07-25 17:50:11 +05:30
lasantha
df47e56a97 enhancing app publishing test cases with role restriction 2017-07-25 17:24:36 +05:30
WSO2 Builder
a52820e36d [maven-release-plugin]prepare for next development iteration 2017-07-23 22:58:55 +05:30
WSO2 Builder
e0712291fd [maven-release-plugin]prepare release v3.1.0-RC2 2017-07-23 22:58:41 +05:30
sameera910409
48a4e22cff fixes https://github.com/wso2/product-iots/issues/1176 : [Windows / IOS Device] Unable to configure IOS devices in windows 2017-07-21 18:59:20 +05:30
madhawap
fed2b73a0d Updating device-mgt, device-mgt-plugin and appmgt versions and release note 2017-07-21 18:38:32 +05:30
Dileesha Rajapakse
456b12e2c5 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-21 16:57:19 +05:30
Dileesha Rajapakse
4ae3bab260 Fixed IoTs README version issues 2017-07-21 16:56:50 +05:30
Dileesha Rajapakse
c471de6e8d Changed the IoTs product version 2017-07-21 13:52:03 +05:30
madhawap
84aa9b780f Adding release note for IoTS 3.1.0 2017-07-21 12:51:18 +05:30
Madhawa Perera
a4dd2b01d9 Merge pull request #1208 from rasika/master
Fixing https://github.com/wso2/product-iots/issues/1205
2017-07-21 11:25:17 +05:30
Rasika Perera
e2070bba4f Fixing https://github.com/wso2/product-iots/issues/1205 2017-07-21 10:13:10 +05:30
Madhawa Perera
d86f395804 Merge pull request #1185 from inoshperera/master
changing app to con app
2017-07-20 19:04:18 +05:30
Madhawa Perera
2046a3549a Merge pull request #1188 from Nirothipan/master
Correcting minor spelling mistake
2017-07-20 18:27:15 +05:30
geethkokila
f2e5ba4c64 Removing few test cases due to sending wrong input for operations. It will take much long to fix them 2017-07-20 18:03:42 +05:30
Rasika Perera
09e0c5e2f4 Fixing https://github.com/wso2/product-iots/issues/1177 2017-07-17 21:51:02 +05:30
Nirothipan
7335f67960 correcting minor spelling mistake 2017-07-17 18:35:17 +05:30
inoshperera
c0cc9da10b changing app to con app 2017-07-17 15:47:30 +05:30
WSO2 Builder
760f6bfa10 [maven-release-plugin]prepare for next development iteration 2017-07-17 03:37:25 +05:30
WSO2 Builder
02c33bb161 [maven-release-plugin]prepare release v3.1.0-RC 2017-07-17 03:37:11 +05:30
lasantha
d3c996fd75 Adding minor UI change to connected cup sample 2017-07-16 11:39:32 +05:30
Nirothipan
3e188b5176 typing mistake in CronEcpression 2017-07-15 11:08:33 +05:30
Madhawa Perera
0157c9c912 Merge pull request #1157 from Nirothipan/master
Fixes for - connected cup analytics data graphs not displayed and broken pipe issue.
2017-07-14 12:44:16 +05:30
Nirothipan
dec82f5b0f changing data count to 100 2017-07-13 18:43:10 +05:30
Nirothipan
3eb75d040d changing update summary to 3 mins 2017-07-13 17:50:40 +05:30
Nirothipan
2ab4e8fa13 changing update summary to 3 mins. 2017-07-13 17:49:58 +05:30
Nirothipan
0bae6b1519 symultaneous stream authentication failure fix 2017-07-12 16:29:43 +05:30
Nirothipan
55601641e3 fixes for connected cup, device_temperature_summary table missing 2017-07-12 14:55:01 +05:30
inoshperera
f11b386493 fixing the integration test issue due to qsg change 2017-07-12 12:50:48 +05:30
inoshperera
0eda232d89 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-11 14:44:40 +05:30
inoshperera
046752fbe5 changing application name 2017-07-11 14:42:09 +05:30
WSO2 Builder
67263f446f [maven-release-plugin]prepare for next development iteration 2017-07-10 20:42:05 +05:30
WSO2 Builder
c599a0ab88 [maven-release-plugin]prepare release v3.1.0-beta2 2017-07-10 20:41:51 +05:30
Madhawa Perera
510c79b186 Merge pull request #1125 from hasuniea/master
fixing issue wso2/product-iots#965
2017-07-08 04:06:51 +05:30
Nirothipan
ed7f15346a updating connected cup order coffee cup url 2017-07-07 18:16:42 +05:30
inoshperera
9c372fa25c Adding a new app for qsg. 2017-07-07 17:44:10 +05:30
inoshperera
cd00a841c5 fixing test failiures. 2017-07-07 11:18:02 +05:30
Hasunie
06ba6e98fc fixing issue wso2/product-iots#965 2017-07-06 15:02:13 +05:30
inoshperera
eb71d1874b fixing qsg issues due to the change of DCR application 2017-07-05 16:26:11 +05:30
Nirothipan
c1a15e11eb correcting typo error 2017-07-04 12:21:22 +05:30
WSO2 Builder
2afb01c675 [maven-release-plugin]prepare for next development iteration 2017-07-02 00:07:40 +05:30
WSO2 Builder
7ecc464d42 [maven-release-plugin]prepare release v3.1.0-beta 2017-07-02 00:07:26 +05:30
WSO2 Builder
d889befe76 [maven-release-plugin]prepare for next development iteration 2017-07-01 21:48:00 +05:30
WSO2 Builder
5efa9d30a5 [maven-release-plugin]prepare release v3.1.0-beta 2017-07-01 21:47:46 +05:30
madhawap
5061465b53 Temporarily removed test case for execution of QSG script 2017-07-01 19:38:31 +05:30
geethkokila
0147fa4784 Fixing the osgi issue 2017-06-30 17:24:10 +05:30
Rasika Perera
4c613e5682 Fixing https://github.com/wso2/product-iots/issues/1066: moving scripts dir into wso2/analytics 2017-06-29 07:49:48 +05:30
Geeth
d6df453472 Merge pull request #1070 from milanperera/iot-master
Removed DCR feature
2017-06-28 18:06:30 +05:30
Madhawa Perera
c6086de22c Merge pull request #1071 from thisaripatabendi/master
Adding coffee level graph to realtime-analytics view
2017-06-28 13:38:32 +05:30
thisaripatabendi
a5154cf269 Adding coffee level graph to realtime-analytics view 2017-06-28 12:39:52 +05:30
Milan Perera
82d1cf41e0 Removed DCR life cycle listener 2017-06-28 12:18:18 +05:30
thisaripatabendi
9b26660971 Adding coffee level graph to realtime-analytics view 2017-06-28 11:41:35 +05:30
Milan Perera
3a394ae869 Removed DCR feature 2017-06-28 11:20:34 +05:30
sinthuja
77cd418e2f Fixing the build failure in the connected cup. 2017-06-27 18:24:57 +05:30
WSO2 Builder
76d8fc62a2 [maven-release-plugin]prepare for next development iteration 2017-06-23 23:06:50 +05:30
WSO2 Builder
cbf7dd8dce [maven-release-plugin]prepare release v3.1.0-alpha 2017-06-23 23:06:36 +05:30
madhawap
2d0104ee10 version changes 2017-06-23 21:58:05 +05:30
madhawap
8b868688ec version changes 2017-06-23 21:38:31 +05:30
sinthuja
c69f74ad2b Updating the source/target JDK versions to 1.8. 2017-06-23 18:13:44 +05:30
sinthuja
ff6642b5ba Adding the executable permission for the mobile qsg script. 2017-06-23 17:23:49 +05:30
sinthuja
f9fb51b671 Updating the qsg script out dated readme. 2017-06-23 17:21:13 +05:30
sinthuja
2803ba29e7 Merge branch 'pr1049' into origin-master
# Conflicts:
#	modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
2017-06-23 17:10:14 +05:30
thisaripatabendi
dd5f4861eb Fixing connected-cup issues. 2017-06-23 16:49:20 +05:30
sinthuja
9bdd2d766f Merge pull request #1048 from dunithd/master
Applying new UX for connected cup device details page
2017-06-23 16:48:35 +05:30
thisaripatabendi
67a6eb0db4 Fixing connected-cup issues. 2017-06-23 16:34:56 +05:30
Ruwan
93f5ed77f0 Merge pull request #1045 from ayyoob/devicetype-3.1.0
temporary fix for api verfication issue in integration test
2017-06-23 15:56:24 +05:30
sinthuja
0b85c80701 Updating the license headers. 2017-06-23 15:51:30 +05:30
sinthuja
cbd4507648 Adding missing connected cup version in the root pom.xml. 2017-06-23 15:30:53 +05:30
dunithd
ee680cfec8 Applying new UX for connected cup device details page 2017-06-23 15:27:23 +05:30
sinthuja
8afe1d5245 Cleaning up the files pom files. 2017-06-23 15:25:45 +05:30
sinthuja
cfe3e59ce3 Removing the unused file device-type, and removing datasource configs from UI feature. 2017-06-23 15:14:04 +05:30
sinthuja
2aad4c7bd4 Updating the coffeeking version as the bundle version. 2017-06-23 15:01:54 +05:30
sinthuja
1773b64d20 Reverting the change done for device type. 2017-06-23 14:08:19 +05:30
ayyoob
8cd1f815e4 temporary fix for api verfication issue 2017-06-23 13:50:25 +05:30
sinthuja
9d866509bd Merge branch 'wso2-master' into test-merge 2017-06-23 13:19:32 +05:30
sinthuja
5aa641183b Fixing some path issue in device type deployables. 2017-06-23 13:09:37 +05:30
sinthuja
c6876695fc Seperating the connected cup feature into backend, api, ui features as recommended feature structure. 2017-06-23 12:54:23 +05:30
sinthuja
5483532882 Fixing some version problem in the connected cup sample. 2017-06-23 11:47:39 +05:30
sinthuja
a8b4699cb9 Fixing intermittent NPE in mobile QSG 2017-06-23 11:05:32 +05:30
ayyoob
8c4f13ee48 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-23 04:12:26 +05:30
ayyoob
32c54e0ab6 adding client truststore key store - temporariy fix until kernel 4.4.17 is released 2017-06-23 04:07:25 +05:30
sinthuja
c04b8e7872 Fixing the old references of the plugins-deployer, and owsap log in the integration tests. 2017-06-22 23:26:45 +05:30
sinthuja
099ce78ea3 Adding missing http push notification extension. 2017-06-22 22:56:09 +05:30
sinthuja
eb473cb7ea Fixing the integration tests with modified plugin-deployer.xml name 2017-06-22 22:03:12 +05:30
ayyoob
5969d413ac moved to released version 2017-06-22 21:57:32 +05:30
sinthuja
b363714446 fixing the issue in creating the connected cup instance. 2017-06-22 20:45:52 +05:30
sinthuja
602e012e2e committing the intermediate changes. 2017-06-22 18:11:52 +05:30
Geeth
911d001aa6 Merge pull request #1034 from sinthuja/test-merge
Fixing  https://github.com/wso2/product-iots/issues/776.
2017-06-22 14:45:00 +05:30
sinthuja
56cbef3f35 Fixing https://github.com/wso2/product-iots/issues/776. 2017-06-22 14:23:05 +05:30
ayyoob
cc94c0b29a few test case fixes 2017-06-22 06:50:39 +05:30
Harshan Liyanage
c240fb9a71 Merge branch 'master' of https://github.com/wso2/product-iots 2017-06-21 18:34:03 +05:30
Harshan Liyanage
0a7e33961a Fixed sample-deployer issues which resolves wso2/product-iots#458 2017-06-21 18:33:39 +05:30
Rasika Perera
d48b7d4939 Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied 2017-06-21 14:52:25 +05:30
ayyoob
6d941a6e72 few fixes on test case 2017-06-20 19:32:51 +05:30
ayyoob
76ddf4fe57 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-17 19:33:14 +05:30
ayyoob
5f80490332 added device type test case 2017-06-17 18:54:59 +05:30
Rasika Perera
c2b573b32c Adding geo fencing 2017-06-16 16:15:15 +05:30
Geeth
ef8ce3e1c6 Merge pull request #1016 from sinthuja/test-merge
Fixing the issues in cipher tool.
2017-06-15 14:19:13 +05:30
sinthuja
b59aec2e48 Fixing the license year in script files. 2017-06-15 13:51:59 +05:30
sinthuja
760f35f912 Merge branch 'wso2-master' into test-merge 2017-06-15 13:42:56 +05:30
sinthuja
38963cb807 Fixing #1003. 2017-06-15 13:42:18 +05:30
ayyoob
bf02c6ccb7 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-15 10:00:56 +05:30
ayyoob
f167b20192 updated migration db queries 2017-06-15 09:47:46 +05:30
Ace
e2def31fdf Increasing timeout 2017-06-14 19:19:56 +05:30
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
Ace
a75f6bc12e Fixing test failure 2017-06-13 17:12:06 +05:30
sinthuja
6ac04eba48 Fixing https://github.com/wso2/product-iots/issues/1000. 2017-06-13 12:56:24 +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
megala21
6b5d4bf05f Increasing the timeout 2017-06-10 23:46:24 +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
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
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
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
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
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
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
megala21
2338043eee Fixing test case failure 2017-05-16 10:08:13 +05:30
megala21
79a4f58929 Fixing issue in tenant-conf.json copying location 2017-05-16 09:06:27 +05:30
megala21
19b06bc8bc Adding android sense test cases 2017-05-15 00:31:24 +05:30
ayyoob
408f392af2 merged with origin 2017-05-09 19:46:59 +05:30
ayyoob
d8620a0088 merged with origin 2017-05-09 19:33:05 +05:30
ayyoob
1c2d1ef231 added filter properties to pick plugins version from parent pom 2017-05-09 16:30:54 +05:30
ayyoob
43552543d2 added android sense analytics feature to the analytics runtime 2017-05-09 16:30:09 +05:30
ayyoob
2c7a7cd9b9 merged with origin 2017-05-09 16:29:32 +05:30
ayyoob
cd79929f42 added default values for global properties 2017-05-09 01:07:24 +05:30
sinthuja
2ec2c2e5b5 removing the android sense feature from key manager profile. 2017-05-08 23:36:03 +05:30
sinthuja
2f3819107a Merge branch 'wso2-master' into test-merge
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	modules/p2-profile/iot-core-profile/pom.xml
#	pom.xml
2017-05-08 22:48:51 +05:30