merge the conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ef2aafa1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ef2aafa1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ef2aafa1 Branch: refs/heads/4.0.0-grouping Commit: ef2aafa1b59a4eaeac784a6a64ad2c8c0872b607 Parents: 0e1c582 3b713db Author: reka <[email protected]> Authored: Thu Sep 18 16:38:35 2014 +0530 Committer: reka <[email protected]> Committed: Thu Sep 18 16:38:35 2014 +0530 ---------------------------------------------------------------------- .../AutoscalerTopologyEventReceiver.java | 40 ++------------------ .../rest/endpoint/services/StratosAdmin.java | 32 ++++++++-------- 2 files changed, 20 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
