lp:~gandelman-a/ubuntu/precise/facter/lp888671
- Get this branch:
- bzr branch lp:~gandelman-a/ubuntu/precise/facter/lp888671
Branch merges
- Dave Walker (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 10595 lines (+6067/-3319)94 files modified.pc/.version (+1/-0)
.pc/applied-patches (+1/-0)
.pc/no-require-rubygems/lib/facter/application.rb (+123/-0)
CHANGELOG (+31/-0)
Rakefile (+41/-36)
conf/redhat/facter.spec (+11/-4)
conf/solaris/pkginfo (+1/-1)
debian/changelog (+27/-6)
debian/control (+2/-2)
debian/patches/no-require-rubygems (+15/-0)
debian/patches/series (+1/-0)
debian/rules (+5/-2)
install.rb (+314/-314)
lib/facter.rb (+229/-229)
lib/facter/Cfkey.rb (+24/-24)
lib/facter/architecture.rb (+22/-30)
lib/facter/domain.rb (+39/-39)
lib/facter/facterversion.rb (+1/-1)
lib/facter/fqdn.rb (+8/-8)
lib/facter/hardwareisa.rb (+2/-2)
lib/facter/hardwaremodel.rb (+19/-19)
lib/facter/hostname.rb (+14/-14)
lib/facter/id.rb (+3/-3)
lib/facter/interfaces.rb (+13/-13)
lib/facter/ipaddress.rb (+123/-123)
lib/facter/iphostnumber.rb (+14/-14)
lib/facter/kernel.rb (+7/-7)
lib/facter/kernelmajversion.rb (+3/-3)
lib/facter/kernelrelease.rb (+18/-18)
lib/facter/kernelversion.rb (+5/-5)
lib/facter/lsb.rb (+14/-14)
lib/facter/lsbmajdistrelease.rb (+8/-8)
lib/facter/macaddress.rb (+63/-63)
lib/facter/macosx.rb (+26/-26)
lib/facter/manufacturer.rb (+28/-28)
lib/facter/memory.rb (+173/-145)
lib/facter/netmask.rb (+4/-4)
lib/facter/network.rb (+4/-4)
lib/facter/operatingsystem.rb (+83/-79)
lib/facter/operatingsystemrelease.rb (+113/-107)
lib/facter/osfamily.rb (+31/-0)
lib/facter/path.rb (+3/-3)
lib/facter/physicalprocessorcount.rb (+8/-0)
lib/facter/processor.rb (+103/-84)
lib/facter/ps.rb (+3/-3)
lib/facter/puppetversion.rb (+7/-7)
lib/facter/rubysitedir.rb (+5/-5)
lib/facter/rubyversion.rb (+1/-1)
lib/facter/ssh.rb (+16/-16)
lib/facter/timezone.rb (+3/-3)
lib/facter/uniqueid.rb (+2/-2)
lib/facter/util/collection.rb (+122/-122)
lib/facter/util/confine.rb (+34/-34)
lib/facter/util/fact.rb (+115/-115)
lib/facter/util/ip.rb (+197/-197)
lib/facter/util/loader.rb (+106/-106)
lib/facter/util/macosx.rb (+52/-52)
lib/facter/util/manufacturer.rb (+97/-97)
lib/facter/util/memory.rb (+79/-79)
lib/facter/util/netmask.rb (+38/-38)
lib/facter/util/plist.rb (+1/-1)
lib/facter/util/plist/generator.rb (+209/-209)
lib/facter/util/plist/parser.rb (+204/-204)
lib/facter/util/processor.rb (+88/-0)
lib/facter/util/resolution.rb (+175/-175)
lib/facter/util/uptime.rb (+59/-59)
lib/facter/util/values.rb (+9/-9)
lib/facter/util/virtual.rb (+81/-71)
lib/facter/util/vlans.rb (+17/-17)
lib/facter/virtual.rb (+126/-131)
lib/facter/vlans.rb (+6/-6)
spec/fixtures/cpuinfo/amd64dual (+57/-0)
spec/fixtures/cpuinfo/amd64quad (+79/-0)
spec/fixtures/cpuinfo/amd64solo (+23/-0)
spec/fixtures/cpuinfo/amd64tri (+86/-0)
spec/fixtures/cpuinfo/bbg3-armel (+12/-0)
spec/fixtures/cpuinfo/beaglexm-armel (+12/-0)
spec/fixtures/cpuinfo/panda-armel (+17/-0)
spec/fixtures/cpuinfo/ppc64 (+19/-0)
spec/fixtures/cpuinfo/sparc (+10/-0)
spec/fixtures/processorcount/solaris-sparc-kstat-cpu-info (+1216/-0)
spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info (+225/-0)
spec/integration/facter_spec.rb (+21/-21)
spec/spec_helper.rb (+10/-1)
spec/unit/architecture_spec.rb (+54/-0)
spec/unit/domain_spec.rb (+23/-0)
spec/unit/memory_spec.rb (+78/-1)
spec/unit/physicalprocessorcount_spec.rb (+47/-41)
spec/unit/processor_spec.rb (+184/-3)
spec/unit/util/processor_spec.rb (+62/-0)
spec/unit/util/uptime_spec.rb (+4/-4)
spec/unit/util/virtual_spec.rb (+26/-5)
spec/unit/virtual_spec.rb (+47/-2)
spec/watchr.rb (+125/-0)
Related bugs
Bug #408402: Main Inclusion Report for facter. | Undecided | Fix Released | |
Bug #888671: Please merge facter 1.6.2 (main) from Debian testing (main) | Medium | Fix Released |
Related blueprints
Branch information
- Owner:
- Adam Gandelman
- Status:
- Development
Recent revisions
- 22. By Adam Gandelman
-
* debian/rules: Use dh_prep instead of dh_clean, add build-arch + build-indep
targets
* debian/control: Update debhelper Build-Depends to 8, make binary package
depend on ruby1.8 explicitly. - 17. By Adam Gandelman
-
* Merge from Debian testing (LP: #888671). Remaining changes:
- debian/rules: use what we had in natty; we dont want ruby-pkg-tools
in main. (LP: #408402)
- debian/control: Continue using ruby + libopenssl-ruby as Build-Depends
even tho Debian has moved to gem2deb (not in main). Move ruby-json to
Suggests.
* New upstream release - 16. By Adam Gandelman
-
* Merge from Debian unstable (LP: #877621). Remaining changes:
- debian/rules: use what we had in natty; we dont want ruby-pkg-tools
in main. (LP: #408402)
* debian/control: Continue using ruby + libopenssl-ruby as Build-Depends
even tho Debian has moved to gem2deb (not in main). Move ruby-json to
Suggests. - 15. By Andres Rodriguez
-
* Merge from debian unstable (LP: #788284). Remaining changes:
- Dropped ruby-pkg-tools and libsetup-ruby1.8; debian/rules: use what we
had in natty; we dont want ruby-pkg-tools in main. (LP: #408402)
* Dropped changes to lib/facter/ec2.rb. (Use the latest-meta api so it
always does not retunr false). This was fixed upstream. - 14. By Chuck Short
-
lib/facter/ec2.rb: Use the latest-meta api so it always
does not return false. (LP: #732953)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/precise/facter