You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/07/30 07:53:40 UTC

git commit: updated refs/heads/master to 7bccc3e

Updated Branches:
  refs/heads/master 67ab7e558 -> 7bccc3e13


CLOUDSTACK-3580


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7bccc3e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7bccc3e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7bccc3e1

Branch: refs/heads/master
Commit: 7bccc3e133b924621cf358f8eeca5976e092f8cb
Parents: 67ab7e5
Author: Radhika PC <ra...@citrix.com>
Authored: Tue Jul 30 11:23:11 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Tue Jul 30 11:23:11 2013 +0530

----------------------------------------------------------------------
 docs/en-US/hardware-firewall.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bccc3e1/docs/en-US/hardware-firewall.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hardware-firewall.xml b/docs/en-US/hardware-firewall.xml
index db48032..efab3c7 100644
--- a/docs/en-US/hardware-firewall.xml
+++ b/docs/en-US/hardware-firewall.xml
@@ -22,9 +22,11 @@
   <title>Hardware Firewall</title>
   <para>All deployments should have a firewall protecting the management server; see Generic
     Firewall Provisions. Optionally, some deployments may also have a Juniper SRX firewall that will
-    be the default gateway for the guest networks; see <xref linkend="external-guest-firewall-integration"/>.</para>
+    be the default gateway for the guest networks; see <xref
+      linkend="external-guest-firewall-integration"/>.</para>
   <xi:include href="generic-firewall-provisions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="external-guest-firewall-integration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<!--  <xi:include href="cisco-vnmc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
+  <xi:include href="external-guest-firewall-integration.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="vnmc-cisco.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="external-guest-lb-integration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </section>