GitHub user Thanu opened a pull request:
https://github.com/apache/stratos/pull/426
Merging master with data-publisher-integration
This P/R is to merge master branch changes into data-publisher-integration.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/Thanu/stratos data-publisher-integration
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/stratos/pull/426.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #426
----
commit 2fd289b8c6b7f20d56f45e574f77940b3749cb4b
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-22T09:01:13Z
Metering Service Implementation
commit 76c7724b6f248e48b14ba2ea69e6e919291b4194
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-22T10:58:56Z
Publishing events for Metering Service Implementation
commit 07e861937818e3dfae5ee40ce5b5cb7b31668a4b
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-22T12:25:51Z
Publishing events for Metering Service Implementation
commit 632a3a4319ea55bd7bef7c95442e5fe9878b0898
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-22T12:29:57Z
Publishing events for Metering Service Implementation
commit a62fab2081f3b015a713465dc40fde3c184aa24e
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-22T12:46:01Z
Adding DAS Artifacts
commit d5d7f79d6e6b7069cf1993bd9b085cee599ca7cc
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-22T16:44:11Z
Removing comments and jar
commit a61331e0cb9c2a7f87e95a6bc4fec233109a3daf
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-23T09:30:58Z
Removing DAS-Artifacts
commit 218b5fdc520344547abf4d8f11fbc8964919f5f6
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-23T10:21:41Z
Formatting the code
commit 9ceab963b7c7fb5a5e85fc2f54c4d034348ce6e8
Author: Thanuja <thanu...@wso2.com>
Date: 2015-07-23T11:57:35Z
Adding DAS Artifacts
commit 2ff059db4e22baa48ab86f27c9829f89c4e0fc7f
Author: Imesh Gunaratne <im...@apache.org>
Date: 2015-07-23T13:38:21Z
Reverting last set of commits which were merged from pr/403 to master
branch by mistake
commit 4fd98d40350fde987402ffaa0ad7b040003c6be4
Author: R-Rajkumar <rraju1...@gmail.com>
Date: 2015-07-15T07:20:26Z
allow tenants to invoke addCartridgeGroup, removeServiceGroup and
removeApplication APIs
commit 68374dd06ae0a9ef507c6a732e42a800af45973f
Author: Akila Perera <ravihansa3...@gmail.com>
Date: 2015-07-15T14:54:26Z
Remove duplicate invocation of shell extensions
commit f4ee826aa2206d5853ad1614a1ef1825ec7475bb
Author: Akila Perera <ravihansa3...@gmail.com>
Date: 2015-07-25T16:05:05Z
Prepare for next development iteration: update poms to 4.1.1-SNAPSHOT
commit de610a6713bff4ef1212d8e9e17840b7d61c705e
Author: Imesh Gunaratne <im...@apache.org>
Date: 2015-07-26T00:12:14Z
Upgrading fabric8 kubernetes api version to 2.2.16 and removing forked code
commit bc6a32f0660c68e5298525030498598ecd0a646e
Author: Imesh Gunaratne <im...@apache.org>
Date: 2015-07-26T00:21:56Z
Removing additional maven property fabric8-version and reusing
kubernetes.api.version
commit 8e2b6d65fa933849337ab867587c43df9f7cd740
Author: Imesh Gunaratne <im...@apache.org>
Date: 2015-07-26T09:20:09Z
Fixing kubernetes api bundle's export packages and port ranges in
kubernetes clusters in samples
commit 3f1b78b7e8d043f71aba3b8e0c3d35a59a062c1f
Author: Imesh Gunaratne <im...@apache.org>
Date: 2015-07-26T09:22:19Z
Updating kubernetes service port to node port to be used by the access URLs
commit 20e15445e2890ade80828022fdcfb479f4318235
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-17T16:04:43Z
Add the initial structure of lvs extension
commit 5f9c8caca2b86f8bb2c4f332506904f91839403e
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-19T08:06:00Z
LVS extension updates with the configuration generation and add the
lvsvirtualip to the payload
commit 5c83d1ce0e9cd397c3aea00a69d6d2ec81639eb1
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-19T15:04:31Z
Add lvs virtual ip to subscriber info
commit c0455c9ac666484b24ccd948c44742e0d18e9d4f
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-19T16:47:57Z
Add the CreateLVSDummyInterface extension to the PCA
Conflicts:
components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py
commit 956a6688a67bc85e00c1e2444561a69e2b65aada
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T09:11:55Z
Update the INSTALL.md file and samples
Conflicts:
samples/applications/nested/single-level-nested-group-app/artifacts/application.json
samples/applications/simple/single-cartridge-app/artifacts/application.json
samples/cartridges/openstack/php.json
samples/cartridges/openstack/tomcat.json
commit fb2c863dbb66c22887be54de582f2c4b7547564c
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T09:19:32Z
Update the INSTALL.md file
commit cadfc1dd257dbed70a69e291a7f7878aa4a09d75
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T09:26:14Z
Update the INSTALL.md file
commit ffad58c865d37293c34c0f1da93a5a603ad3689a
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T11:59:36Z
Update the INSTALL.md file
commit f00ff3282f2010dcbe5f19321ea1d15aedf12c4a
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T12:00:30Z
Update the INSTALL.md file
commit 18c8f23eb7af048155a46f19524b58a5146f62d4
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T12:01:27Z
Update the INSTALL.md file
commit b4f4363c8ee5cb1348ebe50a325b335d370c0612
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T12:02:58Z
Update the INSTALL.md file
commit 9f208f975caee9e46134413b02a58fa63f827009
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T12:04:33Z
Update the INSTALL.md file
commit 772a61de4510b6718ba510353ff1b0205f9effe6
Author: Gayan Gunarathne <gay...@wso2.com>
Date: 2015-05-22T12:05:53Z
Update the INSTALL.md file
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
