Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack-docs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/b55fc721 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/b55fc721 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/b55fc721 Branch: refs/heads/master Commit: b55fc72186a170b94736a4148d1e353bb27593d6 Parents: c551622 e17d225 Author: Sebastien Goasguen <run...@gmail.com> Authored: Mon Nov 4 08:36:59 2013 +0100 Committer: Sebastien Goasguen <run...@gmail.com> Committed: Mon Nov 4 08:36:59 2013 +0100 ---------------------------------------------------------------------- en-US/alerts.xml | 59 +-- en-US/event-types.xml | 600 +++++++++++++++++-------- en-US/nfs-shares-on-management-server.xml | 34 +- 3 files changed, 448 insertions(+), 245 deletions(-) ----------------------------------------------------------------------