You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@stratos.apache.org by ma...@apache.org on 2013/11/27 05:50:11 UTC

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

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/e47c24c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e47c24c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e47c24c9

Branch: refs/heads/master
Commit: e47c24c97cc72e1ae2ebb77680ec050eacb2dea1
Parents: aadee12 b431ec1
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Tue Nov 26 11:31:03 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Nov 26 11:31:03 2013 +0530

----------------------------------------------------------------------
 .../broker/heartbeat/TopicHealthChecker.java    |   8 +-
 .../distribution/src/main/assembly/bin.xml      |   6 +-
 .../distribution/src/main/conf/log4j.properties |  16 +-
 .../src/main/resources/log4j.properties         | 168 --------------
 .../distribution/src/main/assembly/bin.xml      |  10 +-
 .../distribution/src/main/conf/log4j.properties | 224 ++++++++++++-------
 .../src/main/resources/log4j.properties         | 196 ----------------
 7 files changed, 162 insertions(+), 466 deletions(-)
----------------------------------------------------------------------