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/330ca5ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/330ca5ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/330ca5ec Branch: refs/heads/master Commit: 330ca5ecf4575335e72e36aa0236e60b7f32c2df Parents: 71a6b14 24a47af Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Nov 26 11:14:32 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Nov 26 11:14:32 2013 +0530 ---------------------------------------------------------------------- .../distribution/src/main/assembly/bin.xml | 6 +- .../distribution/src/main/conf/log4j.properties | 16 +- .../src/main/resources/log4j.properties | 168 ------------------- 3 files changed, 10 insertions(+), 180 deletions(-) ----------------------------------------------------------------------
