You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/01/09 17:35:29 UTC

[1/2] git commit: fixing minor issue

Updated Branches:
  refs/heads/master a87541e1c -> 099b3d37e


fixing minor issue


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5e100eb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5e100eb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5e100eb1

Branch: refs/heads/master
Commit: 5e100eb16f064b84ee33a0187710e8e07de4089c
Parents: 07f8050
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Jan 9 22:03:51 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Jan 9 22:03:51 2014 +0530

----------------------------------------------------------------------
 products/stratos-manager/modules/distribution/src/assembly/bin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5e100eb1/products/stratos-manager/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/distribution/src/assembly/bin.xml b/products/stratos-manager/modules/distribution/src/assembly/bin.xml
index bc20e3d..33c4673 100755
--- a/products/stratos-manager/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-manager/modules/distribution/src/assembly/bin.xml
@@ -87,7 +87,7 @@
         </fileSet>
         <fileSet>
             <directory>../../../../components/org.apache.stratos.manager.console/console</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/console</outputDirectory>
             <excludes>
                 <exclude>**/README</exclude>
             </excludes>


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/099b3d37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/099b3d37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/099b3d37

Branch: refs/heads/master
Commit: 099b3d37e0ba677db0a3a8e936748920f1ae9ed5
Parents: 5e100eb a87541e
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Jan 9 22:04:00 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Jan 9 22:04:00 2014 +0530

----------------------------------------------------------------------
 .../listener/InstanceStatusListener.java        |   8 +-
 .../manager/CartridgeSubscriptionManager.java   |   2 +-
 .../publisher/ArtifactUpdatePublisher.java      |  65 -------
 .../InstanceNotificationPublisher.java          |  76 ++++++++
 .../InstanceCleanupNotificationService.java     |  37 ++++
 .../service/RepoNotificationService.java        | 179 ++++++++++---------
 .../SubscriptionMultiTenantBehaviour.java       |   6 +-
 .../src/main/resources/META-INF/services.xml    |  18 ++
 .../event/topology/ClusterRemovedEvent.java     |   2 +-
 .../GradientOfLoadAverageMessageProcessor.java  |   6 +-
 10 files changed, 233 insertions(+), 166 deletions(-)
----------------------------------------------------------------------