Nick, it looks like these patches for #6331 haven't gotten merged.
Are you waiting for code review or something else before merging?
They look good to me, so go ahead and merge.
Matt

On Tue, Feb 15, 2011 at 5:11 PM, nfagerlund <[email protected]> wrote:
> This patch updates links in three files and marks a link in a fourth
> file as unrecoverable.
>
> Signed-off-by: nfagerlund <[email protected]>
> ---
>  README.queueing                           |    2 +-
>  examples/modules/sample-module/README.txt |    4 ++--
>  ext/puppetstoredconfigclean.rb            |    2 +-
>  tasks/rake/git_workflow.rake              |    2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/README.queueing b/README.queueing
> index 8c4a180..83a8e19 100644
> --- a/README.queueing
> +++ b/README.queueing
> @@ -8,7 +8,7 @@ Queue Daemon).
>  Currently this is only supported for "Storeconfigs" which is
>  documented at:
>
> -http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
> +http://projects.puppetlabs.com/projects/1/wiki/Using_Stored_Configuration
>
>  In the future this feature can be extended to any new puppet
>  data which involves storage in a database.
> diff --git a/examples/modules/sample-module/README.txt 
> b/examples/modules/sample-module/README.txt
> index cd35c83..233e54b 100644
> --- a/examples/modules/sample-module/README.txt
> +++ b/examples/modules/sample-module/README.txt
> @@ -12,6 +12,6 @@ templates/sample.erb
>  Note the consistent naming of files for Puppet::Util::Autoload
>
>  Reference Documents:
> -http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation
> +http://docs.puppetlabs.com/guides/modules.html
>  http://docs.puppetlabs.com/guides/custom_functions.html
> -http://reductivelabs.com/trac/puppet/wiki/FunctionReference
> +http://docs.puppetlabs.com/references/latest/function.html
> diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb
> index 16f39ef..dcbefa8 100644
> --- a/ext/puppetstoredconfigclean.rb
> +++ b/ext/puppetstoredconfigclean.rb
> @@ -3,7 +3,7 @@
>  # Script to clean up stored configs for (a) given host(s)
>  #
>  # Credits:
> -# Script was taken from 
> http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
> +# Script was taken from 
> http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
>  (link no longer valid),
>  # which haven been initially posted by James Turnbull
>  # duritong adapted and improved the script a bit.
>
> diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake
> index b2f96c6..980d2fb 100644
> --- a/tasks/rake/git_workflow.rake
> +++ b/tasks/rake/git_workflow.rake
> @@ -1,5 +1,5 @@
>  # This set of tasks helps automate the workflow as described on
> -# http://reductivelabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle
> +# http://projects.puppetlabs.com/projects/puppet/wiki/Development_Lifecycle
>
>
>  def find_start(start)
> --
> 1.7.3.3
>
> --
> You received this message because you are subscribed to the Google Groups 
> "Puppet Developers" group.
> To post to this group, send email to [email protected].
> To unsubscribe from this group, send email to 
> [email protected].
> For more options, visit this group at 
> http://groups.google.com/group/puppet-dev?hl=en.
>
>

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to