Merge branch 'master' into ui-vm-affinity
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/10696101 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/10696101 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/10696101 Branch: refs/heads/master Commit: 106961017478564ad8f9099d07075240c9a085e1 Parents: bd8a9e9 4cc1097 Author: Brian Federle <brian.fede...@citrix.com> Authored: Mon Apr 15 14:07:19 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Mon Apr 15 14:07:19 2013 -0700 ---------------------------------------------------------------------- docs/en-US/ipv6-support.xml | 4 ++-- .../com/cloud/server/ConfigurationServerImpl.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
