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/a1f2609a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a1f2609a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a1f2609a Branch: refs/heads/master Commit: a1f2609a9ed25435c5865877a93a472354fdcccb Parents: 36b6e26 94c9115 Author: Pradeep Fernando <[email protected]> Authored: Wed Apr 9 11:01:43 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Wed Apr 9 11:01:43 2014 +0530 ---------------------------------------------------------------------- .../balancer/mediators/LocationReWriter.java | 80 ++++++++++++++++++++ .../manager/CartridgeSubscriptionManager.java | 2 +- .../synapse-configs/default/sequences/main.xml | 20 +---- 3 files changed, 85 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
