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/11fadffd Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/11fadffd Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/11fadffd Branch: refs/heads/master Commit: 11fadffdd5a338ead78a722282f02aa1cb73e424 Parents: 0306ee8 2c39018 Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 13:09:49 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 13:09:49 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/LbClusterMonitor.java | 27 +++++++++++++++----- .../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 +- 12 files changed, 32 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
