deal with warnings

Author: Daan Hoogland

engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java

@@ -97,17 +97,8 @@ HostPodVO createPod(long userId, String podName, DataCenter zone, String gateway
      *
      * @param networkDomain
      * @param isSecurityGroupEnabled
-<<<<<<< HEAD
-     * @param ip6Dns1
-     * @param ip6Dns2
-     * @return
-     * @throws
-     * @throws
-=======
-     *            TODO
      * @param ip6Dns1 TODO
      * @param ip6Dns2 TODO
->>>>>>> 2240215e42e (config cleanup)
      */
     DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain,
         Long domainId, NetworkType zoneType, String allocationState, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, String ip6Dns1,
@@ -117,13 +108,7 @@ DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2,
      * Deletes a VLAN from the database, along with all of its IP addresses. Will not delete VLANs that have allocated
      * IP addresses.
      *
-<<<<<<< HEAD
-     * @param userId
-     * @param vlanDbId
-     * @param caller
-=======
      * @param caller TODO
->>>>>>> 2240215e42e (config cleanup)
      * @return success/failure
      */
     VlanVO deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller);
@@ -134,44 +119,38 @@ DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2,
 
     /**
      * Creates a new network offering
-<<<<<<< HEAD
-     *
      * @param name
      * @param displayText
      * @param trafficType
      * @param tags
      * @param specifyVlan
-=======
->>>>>>> 2240215e42e (config cleanup)
+     * @param availability
      * @param networkRate
      * @param serviceProviderMap
      * @param isDefault
      * @param type
      * @param systemOnly
-<<<<<<< HEAD
      * @param serviceOfferingId
-     * @param conserveMode       ;
+     * @param conserveMode
+     * @param serviceCapabilityMap
      * @param specifyIpRanges
-     * @param isPersistent       ;
+     * @param isPersistent
      * @param details
+     * @param egressDefaultPolicy
+     * @param maxconn
+     * @param enableKeepAlive
      * @param forVpc
      * @param forTungsten
      * @param forNsx
+     * @param networkMode
      * @param domainIds
      * @param zoneIds
-=======
-     *            TODO
-     * @param conserveMode
-     *            ;
-     * @param specifyIpRanges
-     *            TODO
-     * @param isPersistent
-     *            ;
-     * @param details TODO
->>>>>>> 2240215e42e (config cleanup)
-     * @return network offering object
+     * @param enableOffering
+     * @param internetProtocol
+     * @param routingMode
+     * @param specifyAsNumber
+     * @return the network offering
      */
-
     NetworkOfferingVO createNetworkOffering(String name, String displayText, TrafficType trafficType, String tags, boolean specifyVlan, Availability availability,
                                             Integer networkRate, Map<Service, Set<Provider>> serviceProviderMap, boolean isDefault, Network.GuestType type, boolean systemOnly, Long serviceOfferingId,
                                             boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent,