Merge branch 'docker-grouping-merge' of https://git-wip-us.apache.org/repos/asf/stratos into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4d39532f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4d39532f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4d39532f Branch: refs/heads/docker-grouping-merge Commit: 4d39532f4625e8f18e4619255205a0d6324102c1 Parents: 80855b7 9af8798 Author: R-Rajkumar <[email protected]> Authored: Wed Nov 5 14:05:33 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Wed Nov 5 14:05:33 2014 +0530 ---------------------------------------------------------------------- .../monitor/cluster/ClusterMonitorFactory.java | 121 +++++++++---------- .../AverageServedRequestsEventFormatter.xml | 2 +- .../src/main/conf/siddhi/siddhi.extension | 1 + 3 files changed, 62 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
