commit edfcb5f0bd9faa3c55ad1691465a45b7ef221789
author Jenkins <jenkins@review.openstack.org> Tue May 26 20:17:16 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue May 26 20:17:16 2015 +0000
tree 618ac00bf0cd70523ec0cae1a8cce5a1f0d0fcdc
parent 7b71d376f91c4cad674eda517786d129853e81e8
parent 93ee8c876ca2a8cdea98b6685538f85f1a7979ef

Merge "Set IP_VERSION default value to 4+6"

doc/source/configuration.rst

diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 1cc7083..8e2e7ff 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -391,7 +391,7 @@
         ENABLED_SERVICES=n-vol,n-cpu,n-net,n-api
 
 IP Version
-    | Default: ``IP_VERSION=4``
+    | Default: ``IP_VERSION=4+6``
     | This setting can be used to configure DevStack to create either an IPv4,
       IPv6, or dual stack tenant data network by setting ``IP_VERSION`` to
       either ``IP_VERSION=4``, ``IP_VERSION=6``, or ``IP_VERSION=4+6``