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/3ecb7c61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3ecb7c61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3ecb7c61 Branch: refs/heads/master Commit: 3ecb7c61e7c38be3bd4f8482dbe8accf0a245cf3 Parents: e47c24c 04ae121 Author: Manula Thantriwatte <[email protected]> Authored: Tue Nov 26 16:55:02 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Nov 26 16:55:02 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/TestKnowledgeBase.java | 50 ++++++++++++++++++++ .../broker/heartbeat/TopicHealthChecker.java | 7 +-- .../distribution/src/main/conf/autoscaler.drl | 50 ++++++++++++-------- 3 files changed, 83 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
