puppet 4.1.0 → 4.2.0

data/lib/puppet/transaction.rb

@@ -210,6 +210,7 @@ class Puppet::Transaction
 
   # Evaluate a single resource.
   def eval_resource(resource, ancestor = nil)
+    propagate_failure(resource)
     if skip?(resource)
       resource_status(resource).skipped = true
       resource.debug("Resource is being skipped, unscheduling all events")
@@ -227,30 +228,43 @@ class Puppet::Transaction
 
   # Does this resource have any failed dependencies?
   def failed_dependencies?(resource)
-    # First make sure there are no failed dependencies.  To do this,
-    # we check for failures in any of the vertexes above us.  It's not
-    # enough to check the immediate dependencies, which is why we use
-    # a tree from the reversed graph.
-    found_failed = false
-
-
     # When we introduced the :whit into the graph, to reduce the combinatorial
     # explosion of edges, we also ended up reporting failures for containers
     # like class and stage.  This is undesirable; while just skipping the
     # output isn't perfect, it is RC-safe. --daniel 2011-06-07
     suppress_report = (resource.class == Puppet::Type.type(:whit))
 
-    relationship_graph.dependencies(resource).each do |dep|
-      next unless failed?(dep)
-      found_failed = true
-
+    s = resource_status(resource)
+    if s && s.dependency_failed?
       # See above. --daniel 2011-06-06
       unless suppress_report then
-        resource.notice "Dependency #{dep} has failures: #{resource_status(dep).failed}"
+        s.failed_dependencies.each do |dep|
+          resource.notice "Dependency #{dep} has failures: #{resource_status(dep).failed}"
+        end
       end
     end
 
-    found_failed
+    s && s.dependency_failed?
+  end
+
+  # We need to know if a resource has any failed dependencies before
+  # we try to process it. We keep track of this by keeping a list on
+  # each resource of the failed dependencies, and incrementally
+  # computing it as the union of the failed dependencies of each
+  # first-order dependency. We have to do this as-we-go instead of
+  # up-front at failure time because the graph may be mutated as we
+  # walk it.
+  def propagate_failure(resource)
+    failed = Set.new
+    relationship_graph.direct_dependencies_of(resource).each do |dep|
+      if (s = resource_status(dep))
+        failed.merge(s.failed_dependencies) if s.dependency_failed?
+        if s.failed?
+          failed.add(dep)
+        end
+      end
+    end
+    resource_status(resource).failed_dependencies = failed.to_a
   end
 
   # A general method for recursively generating new resources from a

data/lib/puppet/type/augeas.rb

@@ -109,6 +109,7 @@ Puppet::Type.newtype(:augeas) do
     * `insert <LABEL> <WHERE> <PATH>` --- Synonym for `ins`
     * `mv <PATH> <OTHER PATH>` --- Moves a node at `PATH` to the new location `OTHER PATH`
     * `move <PATH> <OTHER PATH>` --- Synonym for `mv`
+    * `rename <PATH> <LABEL>` --- Rename a node at `PATH` to a new `LABEL`
     * `defvar <NAME> <PATH>` --- Sets Augeas variable `$NAME` to `PATH`
     * `defnode <NAME> <PATH> <VALUE>` --- Sets Augeas variable `$NAME` to `PATH`, creating it with `VALUE` if needed
 

data/lib/puppet/type/exec.rb

@@ -413,9 +413,16 @@ module Puppet
         `grep` determines it's already there.
 
         Note that this command follows the same rules as the main command,
-        which is to say that it must be fully qualified if the path is not set.
+        such as which user and group it's run as.
+        This also means it must be fully qualified if the path is not set.
         It also uses the same provider as the main command, so any behavior
         that differs by provider will match.
+
+        Also note that unless can take an array as its value, e.g.:
+
+            unless => ["test -f /tmp/file1", "test -f /tmp/file2"]
+
+        This will only run the exec if _all_ conditions in the array return false.
       EOT
 
       validate do |cmds|
@@ -456,7 +463,9 @@ module Puppet
         This would run `logrotate` only if that test returned true.
 
         Note that this command follows the same rules as the main command,
-        which is to say that it must be fully qualified if the path is not set.
+        such as which user and group it's run as.
+        This also means it must be fully qualified if the path is not set.
+
         It also uses the same provider as the main command, so any behavior
         that differs by provider will match.
 

data/lib/puppet/type/group.rb

@@ -99,12 +99,20 @@ module Puppet
       def is_to_s(currentvalue)
         if provider.respond_to?(:members_to_s)
           currentvalue = '' if currentvalue.nil?
-          return provider.members_to_s(currentvalue.split(','))
+          currentvalue = currentvalue.is_a?(Array) ? currentvalue : currentvalue.split(',')
+
+          return provider.members_to_s(currentvalue)
         end
 
         super(currentvalue)
       end
       alias :should_to_s :is_to_s
+
+      validate do |value|
+        if provider.respond_to?(:member_valid?)
+          return provider.member_valid?(value)
+        end
+      end
     end
 
     newparam(:auth_membership, :boolean => true, :parent => Puppet::Parameter::Boolean) do

data/lib/puppet/type/mount.rb

@@ -164,6 +164,7 @@ module Puppet
 
       validate do |value|
         raise Puppet::Error, "fstype must not contain whitespace: #{value}" if value =~ /\s/
+        raise Puppet::Error, "fstype must not be an empty string" if value.empty?
       end
     end
 
@@ -174,6 +175,7 @@ module Puppet
 
       validate do |value|
         raise Puppet::Error, "options must not contain whitespace: #{value}" if value =~ /\s/
+        raise Puppet::Error, "options must not be an empty string" if value.empty?
       end
     end
 

data/lib/puppet/type/package.rb

@@ -144,7 +144,7 @@ module Puppet
             return true unless [:absent, :purged, :held].include?(is)
           when :latest
             # Short-circuit packages that are not present
-            return false if is == :absent or is == :purged
+            return false if is == :absent || is == :purged
 
             # Don't run 'latest' more than about every 5 minutes
             if @latest and ((Time.now.to_i - @lateststamp) / 60) < 5
@@ -175,7 +175,7 @@ module Puppet
 
 
           when :absent
-            return true if is == :absent or is == :purged
+            return true if is == :absent || is == :purged
           when :purged
             return true if is == :purged
           # this handles version number matches and
@@ -205,6 +205,17 @@ module Puppet
           super(newvalue)
         end
       end
+
+      def change_to_s(currentvalue, newvalue)
+        # Handle transitioning from any previous state to 'purged'
+        return 'purged' if newvalue == :purged
+
+        # Check for transitions from nil/purged/absent to 'created' (any state that is not absent and not purged)
+        return 'created' if (currentvalue.nil? || currentvalue == :absent || currentvalue == :purged) && (newvalue != :absent && newvalue != :purged)
+
+        # The base should handle the normal property transitions
+        super(currentvalue, newvalue)
+      end
     end
 
     newparam(:name) do

data/lib/puppet/type/service.rb

@@ -42,6 +42,9 @@ module Puppet
 
     feature :flaggable, "The provider can pass flags to the service."
 
+    feature :maskable, "The provider can 'mask' the service.",
+      :methods => [:mask]
+
     newproperty(:enable, :required_features => :enableable) do
       desc "Whether a service should be enabled to start at boot.
         This property behaves quite differently depending on the platform;
@@ -60,6 +63,12 @@ module Puppet
         provider.manual_start
       end
 
+      # This only makes sense on systemd systems. Otherwise, it just defaults
+      # to disable.
+      newvalue(:mask, :event => :service_disabled, :required_features => :maskable) do
+        provider.mask
+      end
+
       def retrieve
         provider.enabled?
       end

data/lib/puppet/util.rb

@@ -454,16 +454,21 @@ module Util
   module_function :exit_on_fail
 
   def deterministic_rand(seed,max)
+    deterministic_rand_int(seed, max).to_s
+  end
+  module_function :deterministic_rand
+
+  def deterministic_rand_int(seed,max)
     if defined?(Random) == 'constant' && Random.class == Class
-      Random.new(seed).rand(max).to_s
+      Random.new(seed).rand(max)
     else
       srand(seed)
-      result = rand(max).to_s
+      result = rand(max)
       srand()
       result
     end
   end
-  module_function :deterministic_rand
+  module_function :deterministic_rand_int
 end
 end
 

data/lib/puppet/util/execution.rb

@@ -119,10 +119,10 @@ module Puppet::Util::Execution
   #   user id matches the effective user id of the current process.
   # @option options [Integer, String] :gid (nil) the group id of the group that the process should be run as. Will be ignored if the
   #   group id matches the effective group id of the current process.
-  # @option options [Boolean] :combine sets whether or not to combine stdout/stderr in the output
+  # @option options [Boolean] :combine sets whether or not to combine stdout/stderr in the output, if false stderr output is discarded
   # @option options [String] :stdinfile (nil) sets a file that can be used for stdin. Passing a string for stdin is not currently
   #   supported.
-  # @option options [Boolean] :squelch (true) if true, ignore stdout / stderr completely.
+  # @option options [Boolean] :squelch (false) if true, ignore stdout / stderr completely.
   # @option options [Boolean] :override_locale (true) by default (and if this option is set to true), we will temporarily override
   #   the user/system locale to "C" (via environment variables LANG and LC_*) while we are executing the command.
   #   This ensures that the output of the command will be formatted consistently, making it predictable for parsing.

data/lib/puppet/util/http_proxy.rb

@@ -1,4 +1,13 @@
 module Puppet::Util::HttpProxy
+  def self.proxy(uri)
+    if self.no_proxy?(uri)
+      proxy_class = Net::HTTP::Proxy(nil)
+    else
+      proxy_class = Net::HTTP::Proxy(self.http_proxy_host, self.http_proxy_port, self.http_proxy_user, self.http_proxy_password)
+    end
+
+    return proxy_class.new(uri.host, uri.port)
+  end
 
   def self.http_proxy_env
     # Returns a URI object if proxy is set, or nil
@@ -11,6 +20,57 @@ module Puppet::Util::HttpProxy
     return nil
   end
 
+  # The documentation around the format of the no_proxy variable seems
+  # inconsistent.  Some suggests the use of the * as a way of matching any
+  # hosts under a domain, e.g.:
+  #   *.example.com
+  # Other documentation suggests that just a leading '.' indicates a domain
+  # level exclusion, e.g.:
+  #   .example.com
+  # We'll accomodate both here.
+  def self.no_proxy?(dest)
+    unless no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"]
+      return false
+    end
+
+    unless dest.is_a? URI
+      begin
+        dest = URI.parse(dest)
+      rescue URI::InvalidURIError
+        return false
+      end
+    end
+
+    no_proxy_env.split(/\s*,\s*/).each do |d|
+      host, port = d.split(':')
+      host = Regexp.escape(host).gsub('\*', '.*')
+
+      #If the host of this no_proxy value starts with '.', this entry is
+      #a domain level entry. Don't pin the regex to the beginning of the entry.
+      #If it does not start with a '.' then it is a host specific entry and
+      #should be matched to the destination starting at the beginning.
+      unless host =~ /^\\\./
+        host = "^#{host}"
+      end
+
+      #If this no_proxy entry specifies a port, we want to match it against
+      #the destination port.  Otherwise just match hosts.
+      if port
+        no_proxy_regex  = %r(#{host}:#{port}$)
+        dest_string     = "#{dest.host}:#{dest.port}"
+      else
+        no_proxy_regex  = %r(#{host}$)
+        dest_string     = "#{dest.host}"
+      end
+
+      if no_proxy_regex.match(dest_string)
+        return true
+      end
+    end
+
+    return false
+  end
+
   def self.http_proxy_host
     env = self.http_proxy_env
 

data/lib/puppet/util/log.rb

@@ -335,7 +335,7 @@ class Puppet::Util::Log
   # If they pass a source in to us, we make sure it is a string, and
   # we retrieve any tags we can.
   def source=(source)
-    if source.respond_to?(:path)
+    if defined?(Puppet::Type) && source.is_a?(Puppet::Type)
       @source = source.path
       source.tags.each { |t| tag(t) }
       self.file = source.file

data/lib/puppet/util/splayer.rb

@@ -0,0 +1,18 @@
+# Handle splay options (sleeping for a random interval before executing)
+module Puppet::Util::Splayer
+  # Have we splayed already?
+  def splayed?
+    !!@splayed
+  end
+
+  # Sleep when splay is enabled; else just return.
+  def splay(do_splay = Puppet[:splay])
+    return unless do_splay
+    return if splayed?
+
+    time = rand(Puppet[:splaylimit] + 1)
+    Puppet.info "Sleeping for #{time} seconds (splay is enabled)"
+    sleep(time)
+    @splayed = true
+  end
+end

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '4.1.0'
+  PUPPETVERSION = '4.2.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/fixtures/unit/provider/package/yum/yum-check-update-obsoletes.txt

@@ -0,0 +1,195 @@
+Loaded plugins: fastestmirror
+Loading mirror speeds from cached hostfile
+
+NetworkManager.x86_64              1:1.0.0-14.git20150121.b4ea599c.el7    base
+NetworkManager-glib.x86_64         1:1.0.0-14.git20150121.b4ea599c.el7    base
+NetworkManager-tui.x86_64          1:1.0.0-14.git20150121.b4ea599c.el7    base
+alsa-firmware.noarch               1.0.28-2.el7                           base
+alsa-lib.x86_64                    1.0.28-2.el7                           base
+audit.x86_64                       2.4.1-5.el7                            base
+audit-libs.x86_64                  2.4.1-5.el7                            base
+authconfig.x86_64                  6.2.8-9.el7                            base
+avahi.x86_64                       0.6.31-14.el7                          base
+avahi-autoipd.x86_64               0.6.31-14.el7                          base
+avahi-libs.x86_64                  0.6.31-14.el7                          base
+bash.x86_64                        4.2.46-12.el7                          base
+bind-libs-lite.x86_64              32:9.9.4-18.el7_1.1                    updates
+bind-license.noarch                32:9.9.4-18.el7_1.1                    updates
+binutils.x86_64                    2.23.52.0.1-30.el7_1.2                 updates
+biosdevname.x86_64                 0.6.1-2.el7                            base
+btrfs-progs.x86_64                 3.16.2-1.el7                           base
+ca-certificates.noarch             2015.2.4-70.0.el7_1                    updates
+centos-logos.noarch                70.0.6-2.el7.centos                    updates
+centos-release.x86_64              7-1.1503.el7.centos.2.8                base
+cpp.x86_64                         4.8.3-9.el7                            base
+cronie.x86_64                      1.4.11-13.el7                          base
+cronie-anacron.x86_64              1.4.11-13.el7                          base
+cryptsetup-libs.x86_64             1.6.6-3.el7                            base
+dbus.x86_64                        1:1.6.12-11.el7                        base
+dbus-libs.x86_64                   1:1.6.12-11.el7                        base
+device-mapper.x86_64               7:1.02.93-3.el7                        base
+device-mapper-event.x86_64         7:1.02.93-3.el7                        base
+device-mapper-event-libs.x86_64    7:1.02.93-3.el7                        base
+device-mapper-libs.x86_64          7:1.02.93-3.el7                        base
+device-mapper-persistent-data.x86_64
+                                   0.4.1-2.el7                            base
+dhclient.x86_64                    12:4.2.5-36.el7.centos                 base
+dhcp-common.x86_64                 12:4.2.5-36.el7.centos                 base
+dhcp-libs.x86_64                   12:4.2.5-36.el7.centos                 base
+dnsmasq.x86_64                     2.66-13.el7_1                          updates
+dracut.x86_64                      033-241.el7_1.1                        updates
+dracut-config-rescue.x86_64        033-241.el7_1.1                        updates
+dracut-network.x86_64              033-241.el7_1.1                        updates
+e2fsprogs.x86_64                   1.42.9-7.el7                           base
+e2fsprogs-libs.x86_64              1.42.9-7.el7                           base
+elfutils-libelf.x86_64             0.160-1.el7                            base
+elfutils-libs.x86_64               0.160-1.el7                            base
+ethtool.x86_64                     2:3.15-2.el7                           base
+firewalld.noarch                   0.3.9-11.el7                           base
+freetype.x86_64                    2.4.11-10.el7_1.1                      updates
+gcc.x86_64                         4.8.3-9.el7                            base
+glib-networking.x86_64             2.40.0-1.el7                           base
+glib2.x86_64                       2.40.0-4.el7                           base
+glibc.x86_64                       2.17-78.el7                            base
+glibc-common.x86_64                2.17-78.el7                            base
+glibc-devel.x86_64                 2.17-78.el7                            base
+glibc-headers.x86_64               2.17-78.el7                            base
+gmp.x86_64                         1:6.0.0-11.el7                         base
+gnutls.x86_64                      3.3.8-12.el7                           base
+grep.x86_64                        2.20-1.el7                             base
+grub2.x86_64                       1:2.02-0.16.el7.centos                 base
+grub2-tools.x86_64                 1:2.02-0.16.el7.centos                 base
+grubby.x86_64                      8.28-11.el7                            base
+hwdata.noarch                      0.252-7.5.el7                          base
+hwdata.x86_64                      0.252-7.8.el7_1                        updates
+initscripts.x86_64                 9.49.24-1.el7                          base
+iproute.x86_64                     3.10.0-21.el7                          base
+iprutils.x86_64                    2.4.3-3.el7                            base
+irqbalance.x86_64                  2:1.0.7-1.el7                          base
+iwl100-firmware.noarch             39.31.5.1-36.el7                       base
+iwl1000-firmware.noarch            1:39.31.5.1-36.el7                     base
+iwl105-firmware.noarch             18.168.6.1-36.el7                      base
+iwl135-firmware.noarch             18.168.6.1-36.el7                      base
+iwl2000-firmware.noarch            18.168.6.1-36.el7                      base
+iwl2030-firmware.noarch            18.168.6.1-36.el7                      base
+iwl3160-firmware.noarch            22.0.7.0-36.el7                        base
+iwl3945-firmware.noarch            15.32.2.9-36.el7                       base
+iwl4965-firmware.noarch            228.61.2.24-36.el7                     base
+iwl5000-firmware.noarch            8.83.5.1_1-36.el7                      base
+iwl5150-firmware.noarch            8.24.2.2-36.el7                        base
+iwl6000-firmware.noarch            9.221.4.1-36.el7                       base
+iwl6000g2a-firmware.noarch         17.168.5.3-36.el7                      base
+iwl6000g2b-firmware.noarch         17.168.5.2-36.el7                      base
+iwl6050-firmware.noarch            41.28.5.1-36.el7                       base
+iwl7260-firmware.noarch            22.0.7.0-36.el7                        base
+kbd.x86_64                         1.15.5-11.el7                          base
+kbd-misc.noarch                    1.15.5-11.el7                          base
+kernel.x86_64                      3.10.0-229.4.2.el7                     updates
+kernel-headers.x86_64              3.10.0-229.4.2.el7                     updates
+kernel-tools.x86_64                3.10.0-229.4.2.el7                     updates
+kernel-tools-libs.x86_64           3.10.0-229.4.2.el7                     updates
+kexec-tools.x86_64                 2.0.7-19.el7_1.2                       updates
+kmod.x86_64                        14-10.el7                              base
+kmod-libs.x86_64                   14-10.el7                              base
+kpartx.x86_64                      0.4.9-77.el7                           base
+krb5-libs.x86_64                   1.12.2-14.el7                          base
+libblkid.x86_64                    2.23.2-22.el7_1                        updates
+libcom_err.x86_64                  1.42.9-7.el7                           base
+libdb.x86_64                       5.3.21-17.el7_0.1                      base
+libdb-utils.x86_64                 5.3.21-17.el7_0.1                      base
+libdrm.x86_64                      2.4.56-2.el7                           base
+libgcc.x86_64                      4.8.3-9.el7                            base
+libgcrypt.x86_64                   1.5.3-12.el7_1.1                       updates
+libgcrypt-devel.x86_64             1.5.3-12.el7_1.1                       updates
+libgomp.x86_64                     4.8.3-9.el7                            base
+libgudev1.x86_64                   208-20.el7_1.3                         updates
+libmount.x86_64                    2.23.2-22.el7_1                        updates
+libnl3.x86_64                      3.2.21-8.el7                           base
+libnl3-cli.x86_64                  3.2.21-8.el7                           base
+libpcap.x86_64                     14:1.5.3-4.el7_1.2                     updates
+libsoup.x86_64                     2.46.0-3.el7                           base
+libss.x86_64                       1.42.9-7.el7                           base
+libstdc++.x86_64                   4.8.3-9.el7                            base
+libtasn1.x86_64                    3.8-2.el7                              base
+libteam.x86_64                     1.15-1.el7                             base
+libuuid.x86_64                     2.23.2-22.el7_1                        updates
+libxml2.x86_64                     2.9.1-5.el7_1.2                        updates
+libxml2-devel.x86_64               2.9.1-5.el7_1.2                        updates
+libyaml.x86_64                     0.1.4-11.el7_0                         base
+linux-firmware.noarch              20140911-0.1.git365e80c.el7            base
+lvm2.x86_64                        7:2.02.115-3.el7                       base
+lvm2-libs.x86_64                   7:2.02.115-3.el7                       base
+mariadb-libs.x86_64                1:5.5.41-2.el7_0                       base
+microcode_ctl.x86_64               2:2.1-10.el7                           base
+nettle.x86_64                      2.7.1-4.el7                            base
+nspr.x86_64                        4.10.8-1.el7_1                         updates
+nss.x86_64                         3.18.0-2.2.el7_1                       updates
+nss-softokn.x86_64                 3.16.2.3-9.el7                         base
+nss-softokn-freebl.x86_64          3.16.2.3-9.el7                         base
+nss-sysinit.x86_64                 3.18.0-2.2.el7_1                       updates
+nss-tools.x86_64                   3.18.0-2.2.el7_1                       updates
+nss-util.x86_64                    3.18.0-1.el7_1                         updates
+ntpdate.x86_64                     4.2.6p5-19.el7.centos                  base
+numactl-libs.x86_64                2.0.9-4.el7                            base
+open-vm-tools.x86_64               9.4.0-6.el7                            base
+openldap.x86_64                    2.4.39-6.el7                           base
+openssh.x86_64                     6.6.1p1-12.el7_1                       updates
+openssh-clients.x86_64             6.6.1p1-12.el7_1                       updates
+openssh-server.x86_64              6.6.1p1-12.el7_1                       updates
+openssl.x86_64                     1:1.0.1e-42.el7.4                      updates
+openssl-libs.x86_64                1:1.0.1e-42.el7.4                      updates
+p11-kit.x86_64                     0.20.7-3.el7                           base
+p11-kit-trust.x86_64               0.20.7-3.el7                           base
+pam.x86_64                         1.1.8-12.el7                           base
+parted.x86_64                      3.1-20.el7                             base
+pcre.x86_64                        8.32-14.el7                            base
+plymouth.x86_64                    0.8.9-0.13.20140113.el7.centos         base
+plymouth-core-libs.x86_64          0.8.9-0.13.20140113.el7.centos         base
+plymouth-scripts.x86_64            0.8.9-0.13.20140113.el7.centos         base
+policycoreutils.x86_64             2.2.5-15.el7                           base
+procps-ng.x86_64                   3.3.10-3.el7                           base
+pygobject3-base.x86_64             3.8.2-6.el7                            base
+python-backports.x86_64            1.0-8.el7                              base
+python-urlgrabber.noarch           3.10-6.el7                             base
+rpm.x86_64                         4.11.1-25.el7                          base
+rpm-build-libs.x86_64              4.11.1-25.el7                          base
+rpm-libs.x86_64                    4.11.1-25.el7                          base
+rpm-python.x86_64                  4.11.1-25.el7                          base
+rsyslog.x86_64                     7.4.7-7.el7_0                          base
+rubygem-bigdecimal.x86_64          1.2.0-24.el7                           base
+rubygem-io-console.x86_64          0.4.2-24.el7                           base
+rubygem-json.x86_64                1.7.7-24.el7                           base
+rubygem-psych.x86_64               2.0.0-24.el7                           base
+rubygems.noarch                    2.0.14-24.el7                          base
+selinux-policy.noarch              3.13.1-23.el7_1.7                      updates
+selinux-policy-targeted.noarch     3.13.1-23.el7_1.7                      updates
+setup.noarch                       2.8.71-5.el7                           base
+shadow-utils.x86_64                2:4.1.5.1-18.el7                       base
+sudo.x86_64                        1.8.6p7-13.el7                         base
+systemd.x86_64                     208-20.el7_1.3                         updates
+systemd-libs.x86_64                208-20.el7_1.3                         updates
+systemd-sysv.x86_64                208-20.el7_1.3                         updates
+teamd.x86_64                       1.15-1.el7                             base
+tuned.noarch                       2.4.1-1.el7                            base
+tzdata.noarch                      2015d-1.el7                            updates
+util-linux.x86_64                  2.23.2-22.el7_1                        updates
+wpa_supplicant.x86_64              1:2.0-13.el7_0                         base
+xfsprogs.x86_64                    3.2.1-6.el7                            base
+xz.x86_64                          5.1.2-9alpha.el7                       base
+xz-devel.x86_64                    5.1.2-9alpha.el7                       base
+xz-libs.x86_64                     5.1.2-9alpha.el7                       base
+yum.noarch                         3.4.3-125.el7.centos                   base
+yum-plugin-fastestmirror.noarch    1.1.31-29.el7                          base
+Obsoleting Packages
+NetworkManager.x86_64              1:1.0.0-14.git20150121.b4ea599c.el7    base
+    NetworkManager.x86_64          1:0.9.9.1-25.git20140326.4dba720.el7_0 @updates
+NetworkManager-adsl.x86_64         1:1.0.0-14.git20150121.b4ea599c.el7    base
+    NetworkManager.x86_64          1:0.9.9.1-25.git20140326.4dba720.el7_0 @updates
+NetworkManager-bluetooth.x86_64    1:1.0.0-14.git20150121.b4ea599c.el7    base
+    NetworkManager.x86_64          1:0.9.9.1-25.git20140326.4dba720.el7_0 @updates
+NetworkManager-team.x86_64         1:1.0.0-14.git20150121.b4ea599c.el7    base
+    NetworkManager.x86_64          1:0.9.9.1-25.git20140326.4dba720.el7_0 @updates
+NetworkManager-wifi.x86_64         1:1.0.0-14.git20150121.b4ea599c.el7    base
+    NetworkManager.x86_64          1:0.9.9.1-25.git20140326.4dba720.el7_0 @updates
+NetworkManager-wwan.x86_64         1:1.0.0-14.git20150121.b4ea599c.el7    base
+    NetworkManager.x86_64          1:0.9.9.1-25.git20140326.4dba720.el7_0 @updates