Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ca498147 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ca498147 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ca498147 Branch: refs/heads/regions Commit: ca498147dad3957122075ac70aca724c4305502a Parents: 63f7c12 39e4c60 Author: Pranav Saxena <[email protected]> Authored: Mon Oct 1 22:54:55 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Mon Oct 1 22:54:55 2012 +0530 ---------------------------------------------------------------------- LICENSE | 2 + .../root/redundant_router/arping_gateways.sh.templ | 17 +++++++++++++++ .../root/redundant_router/keepalived.conf.templ | 17 +++++++++++++++ tools/whisker/descriptor.xml | 7 ++++++ 4 files changed, 43 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
