diff options
| author | Michal Minar <miminar@redhat.com> | 2013-03-20 13:50:42 +0100 |
|---|---|---|
| committer | Michal Minar <miminar@redhat.com> | 2013-03-20 13:50:42 +0100 |
| commit | e3102c1da64230309d8da5f3740db9b493cb8db5 (patch) | |
| tree | 698790e6bedcfb95802e355f1d21efb71b397aa0 /src/python/setup.py | |
| parent | d0d3fb803114c070bd9b8f088025fbf7dba7fa02 (diff) | |
| parent | b5e14dcdb73d3b70131b9a602efd209488922a4e (diff) | |
Merge remote-tracking branch 'origin/master' into software-smash
Conflicts:
src/software/cli/software.py
src/software/openlmi/__init__.py
src/software/openlmi/software/LMI_HostedSoftwareIdentityResource.py
src/software/openlmi/software/LMI_SoftwareFileCheck.py
src/software/openlmi/software/LMI_SoftwareInstalledPackage.py
src/software/openlmi/software/LMI_SoftwarePackage.py
src/software/openlmi/software/__init__.py
src/software/openlmi/software/cimom_entry.py
src/software/openlmi/software/core/ComputerSystem.py
src/software/openlmi/software/core/SoftwareFileCheck.py
src/software/openlmi/software/core/SoftwareInstalledPackage.py
src/software/openlmi/software/core/SoftwarePackage.py
src/software/openlmi/software/core/SoftwarePackageChecks.py
src/software/openlmi/software/core/__init__.py
src/software/openlmi/software/util/__init__.py
src/software/openlmi/software/yumdb/__init__.py
src/software/openlmi/software/yumdb/errors.py
src/software/openlmi/software/yumdb/jobs.py
src/software/openlmi/software/yumdb/packagecheck.py
src/software/openlmi/software/yumdb/packageinfo.py
src/software/openlmi/software/yumdb/process.py
src/software/test/base.py
src/software/test/rpmcache.py
src/software/test/run.py
src/software/test/test_software_file_check.py
src/software/test/test_software_installed_package.py
src/software/test/test_software_package.py
Diffstat (limited to 'src/python/setup.py')
0 files changed, 0 insertions, 0 deletions