fix fabric8io#3349: adding consistency to the handling of option values

    pick fca47f8 chore(deps): bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0
    pick b5ef58c fix fabric8io#3349: adding consistency to the handling of option values
    pick a7c7b321a Updated changelog
    pick 1ad8eb953 Fixed indentation, renamed cinverdionReview.json and updated changelog

CHANGELOG.md

@@ -13,6 +13,7 @@
 * Fix #3349: ensuring that dsl context values always are applied over user ListOptions
 * Fix #3372: Add generatePackageSuffix option to Model Generator to allow flexible package names for generated model
 * Fix #3336: Added ConversionReview to Kubernetes APIExtensions Model
+* Fix #3349: ensuring that dsl context values always are applied over user ListOptions
 
 #### Dependency Upgrade
 

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java

@@ -238,9 +238,14 @@ public synchronized <T extends CustomResource<?,?>, L extends KubernetesResource
    * @return the shared index informer
    */
   private synchronized <T extends HasMetadata, L extends KubernetesResourceList<T>> SharedIndexInformer<T> sharedIndexInformerFor(Class<T> apiTypeClass, Class<L> apiListTypeClass, OperationContext operationContext, long resyncPeriodInMillis, ResourceDefinitionContext rdc) {
+<<<<<<< HEAD
 
     HasMetadataOperationsImpl<T, L> resources = getResourceOperation(apiTypeClass, apiListTypeClass, operationContext, rdc);
 
+=======
+    ResourceOperationsImpl<T, L> resources = getResourceOperation(apiTypeClass, apiListTypeClass, operationContext, rdc);
+
+>>>>>>> 29056cf8e (fix #3349: adding consistency to the handling of option values)
     // we want the resources to no longer reference a resourceVersion
     SharedIndexInformer<T> informer = new DefaultSharedIndexInformer<>(apiTypeClass, resources.withResourceVersion(null), resyncPeriodInMillis, informerExecutor);
     this.informers.add(new AbstractMap.SimpleEntry<>(resources.getOperationContext(), informer));