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/593451a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/593451a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/593451a5 Branch: refs/heads/master Commit: 593451a5941aa96495a222ff47a1f33ad526a99a Parents: f6168bc 11480eb Author: Sajith Kariyawasam <[email protected]> Authored: Wed Dec 4 18:28:20 2013 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Wed Dec 4 18:28:20 2013 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/stratos/autoscaler/AutoscalerContext.java | 2 +- .../java/org/apache/stratos/load/balancer/LoadBalancerContext.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
