puppet into 0.24.x
281448fb47a7Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x

Details

Provenance

James Turnbull <james@lovedthanlost.net>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUf1d75c8bc260: Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
rPUba803a1fb819: Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 0.24.x

Branches

Unknown

Tags

Unknown

Event Timeline

James Turnbull <james@lovedthanlost.net> committed rPU281448fb47a7: Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x (authored by James Turnbull <james@lovedthanlost.net>).Mar 3 2008, 1:59 AM

Merged Changes

ba803a1fb819 Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 0.24.x
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
ba2814cb9b76 Merge commit 'shadoi/0.24.x' into 0.24.x
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
f79cf375bf4a Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 0.24.x
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
a7339ec5f669 Fixing a few tests
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
e008b02ae045 Fixing #1110 -- transactions now always make sure their tags are arrays.
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
65b72676aef2 Fixing the fact that resources that model defined resources were getting…
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
4c3fa7806d12 Fixing a few more loading order issues.
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
857814ac80cf Fixing tests that did not work with Rails 2.
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
7ca0ad64f486 Fixing a test that changed the environment for all later tests, thus breaking…
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
9b07758e02fc * Tweaks for puppetshow UI cleanup
Author
Blake Barnett <bdb@bdb-debvm1.stanford.edu>
Browse Repository
No Builds
No Audits
5d3dd9e718cb Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Author
Blake Barnett <bdb@bdb-debvm1.stanford.edu>
Browse Repository
No Builds
No Audits
0139889be92a * Add migration for "created_at" (hobo expects it) * Tweaks for puppetshow…
Author
Blake Barnett <bdb@bdb-debvm1.stanford.edu>
Browse Repository
No Builds
No Audits

Changes (28)

Path

Size

bin/

puppetmasterd

lib/

puppet.rb

puppet/

	network.rb/
	network/


	http_server.rb

network/

client/

master.rb

parser/

resource.rb

rails.rb

rails/

database/

001_add_created_at_to_all_tables.rb

spec/

unit/

other/

transaction.rb

parser/

resource.rb

test/

network/

client/

master.rb

rails/

railsparameter.rb

railsresource.rb

ral/

type/

file.rb

tidy.rb

rPU281448fb47a7

View Options

bin/puppetmasterd

View Options

lib/puppet.rb

View Options

lib/puppet/network.rb

View Options

lib/puppet/network/client/master.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/rails.rb

View Options

lib/puppet/rails/database/001_add_created_at_to_all_tables.rb

View Options

lib/puppet/rails/external

View Options

lib/puppet/rails/external/tagging

View Options

lib/puppet/rails/external/tagging/README

View Options

lib/puppet/rails/external/tagging/acts_as_taggable.rb

View Options

lib/puppet/rails/external/tagging/init.rb

View Options

lib/puppet/rails/external/tagging/tag.rb

View Options

lib/puppet/rails/external/tagging/tagging.rb

View Options

lib/puppet/rails/fact_value.rb

View Options

lib/puppet/rails/host.rb

View Options

lib/puppet/rails/param_value.rb

View Options

lib/puppet/rails/puppet_class.rb

View Options

lib/puppet/rails/resource_tag.rb

View Options

lib/puppet/rails/source_file.rb

View Options

lib/puppet/transaction.rb

View Options

spec/unit/other/transaction.rb

View Options

spec/unit/parser/resource.rb

View Options

test/network/client/master.rb

View Options

test/rails/railsparameter.rb

View Options

test/rails/railsresource.rb

View Options

test/ral/type/file.rb

View Options

Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x281448fb47a7UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (28)

rPU281448fb47a7

bin/puppetmasterd

lib/puppet.rb

lib/puppet/network.rb

lib/puppet/network/client/master.rb

lib/puppet/parser/resource.rb

lib/puppet/rails.rb

lib/puppet/rails/database/001_add_created_at_to_all_tables.rb

lib/puppet/rails/external

lib/puppet/rails/external/tagging

lib/puppet/rails/external/tagging/README

lib/puppet/rails/external/tagging/acts_as_taggable.rb

lib/puppet/rails/external/tagging/init.rb

lib/puppet/rails/external/tagging/tag.rb

lib/puppet/rails/external/tagging/tagging.rb

lib/puppet/rails/fact_value.rb

lib/puppet/rails/host.rb

lib/puppet/rails/param_value.rb

lib/puppet/rails/puppet_class.rb

lib/puppet/rails/resource_tag.rb

lib/puppet/rails/source_file.rb

lib/puppet/transaction.rb

spec/unit/other/transaction.rb

spec/unit/parser/resource.rb

test/network/client/master.rb

test/rails/railsparameter.rb

test/rails/railsresource.rb

test/ral/type/file.rb

test/ral/type/tidy.rb

Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
281448fb47a7Unpublished
Actions