Merge branch 'master' of github.com:kubernetes-incubator/client-python into release-4.0

Author: yliaog

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.0.0
+- api change V1PersistentVolumeSpec to V1ScaleIOPersistentVolumeSource #397.
+
 # v4.0.0b1
 - Make sure PyPI source distribution is complete with all files from the root directory
 

kubernetes/README.md

@@ -984,6 +984,7 @@ Class | Method | HTTP request | Description
  - [V1RoleRef](docs/V1RoleRef.md)
  - [V1SELinuxOptions](docs/V1SELinuxOptions.md)
  - [V1Scale](docs/V1Scale.md)
+ - [V1ScaleIOPersistentVolumeSource](docs/V1ScaleIOPersistentVolumeSource.md)
  - [V1ScaleIOVolumeSource](docs/V1ScaleIOVolumeSource.md)
  - [V1ScaleSpec](docs/V1ScaleSpec.md)
  - [V1ScaleStatus](docs/V1ScaleStatus.md)

kubernetes/client/__init__.py

@@ -217,6 +217,7 @@
 from .models.v1_role_ref import V1RoleRef
 from .models.v1_se_linux_options import V1SELinuxOptions
 from .models.v1_scale import V1Scale
+from .models.v1_scale_io_persistent_volume_source import V1ScaleIOPersistentVolumeSource
 from .models.v1_scale_io_volume_source import V1ScaleIOVolumeSource
 from .models.v1_scale_spec import V1ScaleSpec
 from .models.v1_scale_status import V1ScaleStatus

kubernetes/client/models/__init__.py

@@ -217,6 +217,7 @@
 from .v1_role_ref import V1RoleRef
 from .v1_se_linux_options import V1SELinuxOptions
 from .v1_scale import V1Scale
+from .v1_scale_io_persistent_volume_source import V1ScaleIOPersistentVolumeSource
 from .v1_scale_io_volume_source import V1ScaleIOVolumeSource
 from .v1_scale_spec import V1ScaleSpec
 from .v1_scale_status import V1ScaleStatus

kubernetes/client/models/v1_persistent_volume_spec.py

@@ -54,7 +54,7 @@ class V1PersistentVolumeSpec(object):
         'portworx_volume': 'V1PortworxVolumeSource',
         'quobyte': 'V1QuobyteVolumeSource',
         'rbd': 'V1RBDVolumeSource',
-        'scale_io': 'V1ScaleIOVolumeSource',
+        'scale_io': 'V1ScaleIOPersistentVolumeSource',
         'storage_class_name': 'str',
         'storageos': 'V1StorageOSPersistentVolumeSource',
         'vsphere_volume': 'V1VsphereVirtualDiskVolumeSource'
@@ -715,7 +715,7 @@ def scale_io(self):
         ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
 
         :return: The scale_io of this V1PersistentVolumeSpec.
-        :rtype: V1ScaleIOVolumeSource
+        :rtype: V1ScaleIOPersistentVolumeSource
         """
         return self._scale_io
 
@@ -726,7 +726,7 @@ def scale_io(self, scale_io):
         ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
 
         :param scale_io: The scale_io of this V1PersistentVolumeSpec.
-        :type: V1ScaleIOVolumeSource
+        :type: V1ScaleIOPersistentVolumeSource
         """
 
         self._scale_io = scale_io