Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f27bbb3f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f27bbb3f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f27bbb3f Branch: refs/heads/master Commit: f27bbb3f076a51ef12f178eb52aee479cf53bfcc Parents: 1d959ab 424a843 Author: Imesh Gunaratne <[email protected]> Authored: Fri Oct 24 16:21:46 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Oct 24 16:21:46 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.load.balancer/pom.xml | 6 +++++- .../load-balancer/modules/distribution/pom.xml | 5 +++++ .../distribution/src/main/assembly/bin.xml | 11 ++++++++++ .../src/main/conf/mqtttopic.properties | 21 ++++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
