Skip to content
  • Klaus Aehlig's avatar
    Merge branch 'stable-2.11' into stable-2.12 · a48a18b9
    Klaus Aehlig authored
    
    
    * stable-2.11
      Remove old-style gnt-network connect
      fix lint errors
      Mention the correction option for using the full version
    
    * stable-2.10
      Export VLAN nicparam to NIC configuration scripts
      Fix gnt-network client to accept vlan info
      Fix query mechanism wrt networks and vlans
      Fix LUNetwork* hooks to comply with docs
      Fix LUNetworkConnect wrt vlan
    
    Conflicts:
    	lib/client/gnt_network.py
    	lib/hypervisor/hv_kvm/__init__.py
    Resolution:
    	lib/client/gnt_network.py: use stable-2.11 version
    	lib/hypervisor/hv_kvm/__init__.py: use stable-2.12 version
    
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    a48a18b9
To find the state of this project's repository at the time of any of these versions, check out the tags.