Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50dc67bc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50dc67bc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50dc67bc Branch: refs/heads/disk_io_throttling Commit: 50dc67bc2e5e15522f299c05e2923b34bbdd1081 Parents: 76ce304 840e14d Author: Wei Zhou <w.z...@leaseweb.com> Authored: Mon Jun 10 15:01:08 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Mon Jun 10 15:01:08 2013 +0200 ---------------------------------------------------------------------- docs/en-US/pvlan.xml | 118 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
