Skip to content

(#11466) Remove deprecated memorytotal fact#204

Merged
slippycheeze merged 1 commit intopuppetlabs:masterfrom
jeffweiss:ticket/master/11466_remove_duplicate_memorytotal_fact
May 13, 2012
Merged

(#11466) Remove deprecated memorytotal fact#204
slippycheeze merged 1 commit intopuppetlabs:masterfrom
jeffweiss:ticket/master/11466_remove_duplicate_memorytotal_fact

Conversation

@jeffweiss
Copy link

The memorytotal fact was previously deprecated in preference to the
memorysize fact. This commit now removes memorytotal.

This commit is a breaking change that will force any remaining
memorytotal fact users to switch to the preferred memorysize fact.

The memorytotal fact was previously deprecated in preference to the
memorysize fact.  This commit now removes memorytotal.

This commit is a breaking change that will force any remaining
memorytotal fact users to switch to the preferred memorysize fact.
slippycheeze added a commit that referenced this pull request May 13, 2012
…licate_memorytotal_fact

(#11466) Remove deprecated memorytotal fact
@slippycheeze slippycheeze merged commit 1538564 into puppetlabs:master May 13, 2012
zaphod42 added a commit that referenced this pull request Nov 2, 2012
…move_duplicate_memorytotal_fact"

This reverts commit 1538564, reversing
changes made to c6aa778.

Conflicts:

	lib/facter/memory.rb
	spec/unit/memory_spec.rb

This is being put back in for the 1.7 series of facter.
jeffmccune pushed a commit that referenced this pull request Nov 6, 2012
* 1.7.x:
  (#11612) Add support for processorX facts on HP-UX
  Revert "Merge pull request #202 from hkenney/ticket/master/3226_strip_whitespace_from_fact"
  Revert "Merge pull request #208 from hkenney/ticket/master/14469_strip_whitespace_from_frozen_strings"
  Revert "Merge pull request #204 from jeffweiss/ticket/master/11466_remove_duplicate_memorytotal_fact"
  Revert "Merge pull request #205 from jeffweiss/ticket/master/12147_remove_iphostnumber_fact"
  Update lib/facter/version.rb for 1.6.14

Conflicts:
	CHANGELOG
	lib/facter/util/config.rb
	lib/facter/version.rb
	spec/unit/util/config_spec.rb
joshcooper added a commit that referenced this pull request Nov 12, 2012
* upstream/1.7.x: (23 commits)
  install.rb doesn't support sbindir, so remove it from ips rules
  Turn on IPS building for facter
  Update ips ruby libdir to use sitelibdir instead of rubylibdir
  (#17493) Merge rescue blocks
  (#17493) Safer handling of EC2 'open' calls
  (Maint) Properly mock SunOS in test for manufacturer
  (#11612) Add support for processorX facts on HP-UX
  Revert "Merge pull request #202 from hkenney/ticket/master/3226_strip_whitespace_from_fact"
  Revert "Merge pull request #208 from hkenney/ticket/master/14469_strip_whitespace_from_frozen_strings"
  Revert "Merge pull request #204 from jeffweiss/ticket/master/11466_remove_duplicate_memorytotal_fact"
  Revert "Merge pull request #205 from jeffweiss/ticket/master/12147_remove_iphostnumber_fact"
  Update lib/facter/version.rb for 1.6.14
  #1415 updated ipaddress6_spec.rb and macaddress_spec.rb to reflect updated ifconfig STDERR redirect
  #1415 ifconfig_interface change.
  #1415 fixed the regex map
  ifconfig_interface should output its output
  #1415 added two methods and spec tests
  #1415 ip_spec.rb test added for linux_ifconfig_ib0
  #16005 Puppet agent generates ifconfig warnings on InfiniBand systems fix
  Handles ruby hanging of File.read of /sys/class/ with cat.
  ...

Conflicts:
	CHANGELOG
	lib/facter/util/config.rb
	lib/facter/version.rb
	spec/unit/util/config_spec.rb
	spec/unit/util/manufacturer_spec.rb

Using manufacturer_spec.rb test that stubs hardwareisa
whopper pushed a commit to whopper/facter that referenced this pull request Mar 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants