Merge commit 'refs/pull/42/head' of github.com:apache/stratos into kubernetis-host-register
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d774e2af Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d774e2af Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d774e2af Branch: refs/heads/docker-integration Commit: d774e2af29297acbdec1f8de43139ec411368da7 Parents: a9ffb61 becdbf2 Author: Akila Perera <[email protected]> Authored: Fri Sep 19 11:47:23 2014 +0530 Committer: Akila Perera <[email protected]> Committed: Fri Sep 19 11:47:23 2014 +0530 ---------------------------------------------------------------------- .../monitor/KubernetesClusterMonitor.java | 20 +++++++++++++------- .../controller/topology/TopologyBuilder.java | 1 + 2 files changed, 14 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
