Skip to content

Conversation

cyberious
Copy link
Contributor

Conflicts:
lib/puppet/parser/functions/sqlserver_is_domain_or_local_user.rb
lib/puppet/type/sqlserver_features.rb
lib/puppet/type/sqlserver_instance.rb
spec/functions/sqlserver_is_domain_user_spec.rb

…master

Conflicts:
	lib/puppet/parser/functions/sqlserver_is_domain_or_local_user.rb
	lib/puppet/type/sqlserver_features.rb
	lib/puppet/type/sqlserver_instance.rb
	spec/functions/sqlserver_is_domain_user_spec.rb
underscorgan pushed a commit that referenced this pull request Dec 8, 2014
Finish refactor to all methods as issue occurs while running against master
@underscorgan underscorgan merged commit 4cb3776 into puppetlabs:master Dec 8, 2014
@cyberious cyberious deleted the RenameComplete branch December 8, 2014 23:32
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