| Commit message (Collapse) | Author | Age | Files | Lines |
| | |
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/ralsh
lib/puppet/executables/client/certhandler.rb
lib/puppet/parser/functions/versioncmp.rb
lib/puppet/parser/resource/reference.rb
lib/puppet/provider/augeas/augeas.rb
lib/puppet/provider/nameservice/directoryservice.rb
lib/puppet/provider/ssh_authorized_key/parsed.rb
lib/puppet/type.rb
lib/puppet/type/file/checksum.rb
spec/integration/defaults.rb
spec/integration/transaction/report.rb
spec/unit/executables/client/certhandler.rb
spec/unit/indirector/ssl_rsa/file.rb
spec/unit/node/catalog.rb
spec/unit/provider/augeas/augeas.rb
spec/unit/rails.rb
spec/unit/type/ssh_authorized_key.rb
spec/unit/type/tidy.rb
test/executables/filebucket.rb
test/executables/puppetbin.rb
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
lib/puppet/metatype/container.rb
lib/puppet/metatype/instances.rb
lib/puppet/metatype/metaparams.rb
lib/puppet/metatype/relationships.rb
lib/puppet/metatype/schedules.rb
|
| | |
| |
| |
| | |
two different locations
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| | |
Conflicts:
CHANGELOG
test/util/posixtest.rb
|
| | |
| |
| |
| | |
--mandir --destdir in install.rb
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also added the fixes to make the certhandler tests pass
even when certs exist; I'll deal with the conflict later.
Conflicts:
CHANGELOG
bin/puppetd
lib/puppet/network/http/handler.rb
lib/puppet/network/http/mongrel/rest.rb
spec/integration/indirector/rest.rb
spec/integration/network/server/mongrel.rb
spec/integration/network/server/webrick.rb
spec/unit/network/http/webrick.rb
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
CHANGELOG
spec/integration/defaults.rb
spec/integration/node/catalog.rb
spec/unit/rails.rb
spec/unit/type/mount.rb
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
install.rb
lib/puppet/defaults.rb
man/man8/puppet.8
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/
|
|
| |
closed ticket #198
|
| | |
|
| | |
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2580 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
|
|
| |
need to be fixed
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2529 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
|
|
| |
regex that matched darwin but was just supposed to match windows
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2527 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1479 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1266 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1225 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1030 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@779 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
|
|
| |
wrapping the StatusServer in the xmlrpc check
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@766 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@383 980ebf18-57e1-0310-9a29-db15c13687c0
|
| |
|
|
| |
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@305 980ebf18-57e1-0310-9a29-db15c13687c0
|
|
|
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@95 980ebf18-57e1-0310-9a29-db15c13687c0
|