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/61d41066 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/61d41066 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/61d41066 Branch: refs/heads/master Commit: 61d41066d4029f0c639d410b51313ab4a80f97a1 Parents: 472e572 11fadff Author: Udara Liyanage <[email protected]> Authored: Thu Dec 12 13:12:49 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 12 13:12:49 2013 -0500 ---------------------------------------------------------------------- .../stratos/autoscaler/LbClusterMonitor.java | 27 +++++++++++++++----- .../java/org/apache/stratos/cli/RestClient.java | 7 ++++- .../stratos/cli/RestCommandLineService.java | 5 ++++ .../src/main/conf/jndi.properties | 1 + .../distribution/src/main/conf/jndi.properties | 2 +- .../src/main/resources/jndi.properties | 1 + .../src/main/resources/jndi.properties | 1 + .../src/main/resources/jndi.properties | 1 + .../distribution/src/main/conf/jndi.properties | 2 +- .../stratos-controller/conf/jndi.properties | 2 +- .../config/as/repository/conf/jndi.properties | 2 +- .../config/cc/repository/conf/jndi.properties | 2 +- .../config/cep/repository/conf/jndi.properties | 1 + .../config/sm/repository/conf/jndi.properties | 2 +- 14 files changed, 43 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
