Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a5500e19 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a5500e19 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a5500e19 Branch: refs/heads/master Commit: a5500e1911d58bf79dfc42f951e0f81ec91dd707 Parents: f2a4733 1098029 Author: reka <[email protected]> Authored: Thu May 21 19:41:23 2015 +0530 Committer: reka <[email protected]> Committed: Thu May 21 19:41:23 2015 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 18 +++++++-------- .../util/CloudControllerConstants.java | 2 +- .../controller/util/CloudControllerUtil.java | 24 ++++++-------------- .../ClusterInstanceActivatedProcessor.java | 15 ++++++++++++ .../src/main/assembly/filter.properties | 4 ++-- 5 files changed, 34 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
