You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/12 13:07:39 UTC
[1/2] git commit: base dir column was set to null in
cartridge_subscription table
Updated Branches:
refs/heads/master 41e5f6975 -> 32a905ecc
base dir column was set to null in cartridge_subscription table
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/139b1b32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/139b1b32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/139b1b32
Branch: refs/heads/master
Commit: 139b1b3240c3434f0f4157962619a02a55ffe472
Parents: cebf4a2
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Dec 12 17:37:18 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 12 17:37:18 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/resources/stratos_foundation.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/139b1b32/tools/stratos-installer/resources/stratos_foundation.sql
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/resources/stratos_foundation.sql b/tools/stratos-installer/resources/stratos_foundation.sql
index 7ca346d..a8dce27 100644
--- a/tools/stratos-installer/resources/stratos_foundation.sql
+++ b/tools/stratos-installer/resources/stratos_foundation.sql
@@ -76,7 +76,7 @@ CREATE TABLE `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION` (
`STATE` varchar(30) NOT NULL,
`ALIAS` varchar(255) NOT NULL,
`TENANT_DOMAIN` varchar(255) NOT NULL,
- `BASE_DIR` varchar(255) NOT NULL,
+ `BASE_DIR` varchar(255) NULL,
`REPO_ID` int(11) DEFAULT NULL,
`DATA_CARTRIDGE_ID` int(11) DEFAULT NULL,
`MAPPED_DOMAIN` varchar(255),
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/32a905ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/32a905ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/32a905ec
Branch: refs/heads/master
Commit: 32a905ecc0c25196039823abc60ce2287fd169e8
Parents: 139b1b3 41e5f69
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Dec 12 17:37:32 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 12 17:37:32 2013 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 15 ++++-
.../controller/util/CloudControllerUtil.java | 5 +-
.../AverageLoadAverageEventFormatter.xml | 2 +-
.../AverageMemoryConsumptionEventFormatter.xml | 2 +-
.../FaultMessageEventFormatter.xml | 2 +-
.../GradientLoadAverageEventFormatter.xml | 2 +-
.../GradientMemoryConsumptionEventFormatter.xml | 2 +-
...econdDerivativeLoadAverageEventFormatter.xml | 2 +-
...erivativeMemoryConsumptionEventFormatter.xml | 2 +-
.../execution-plans/AverageHeathRequest.xml | 6 +-
.../execution-plans/GradientOfHealthRequest.xml | 6 +-
.../SecondDerivativeOfHealthRequest.xml | 4 +-
.../stream-manager-config.xml | 6 --
.../pom.xml | 8 +++
.../agent/health/publisher/HealthPublisher.java | 10 +--
.../modules/distribution/src/assembly/bin.xml | 3 +-
.../src/main/conf/cartridge-config.properties | 65 ++++++++++++++++++++
17 files changed, 110 insertions(+), 32 deletions(-)
----------------------------------------------------------------------