Branch: refs/heads/master
Home:   https://github.com/puppetlabs/puppet

Commit: 3ab44c7ce01ab86a995deb66228f5be95239c92a
    
https://github.com/puppetlabs/puppet/commit/3ab44c7ce01ab86a995deb66228f5be95239c92a
Author: Max Martin <[email protected]>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M CHANGELOG
  M lib/puppet.rb
  M lib/puppet/provider/group/groupadd.rb
  A lib/puppet/provider/package/macports.rb
  M lib/puppet/rails/inventory_node.rb
  M lib/puppet/type/file/source.rb
  M lib/puppet/type/group.rb
  M lib/puppet/type/service.rb
  M spec/unit/provider/group/groupadd_spec.rb
  A spec/unit/provider/package/macports_spec.rb
  M spec/unit/type/file/source_spec.rb
  M spec/unit/type/group_spec.rb

Log Message:
-----------
Merge branch '2.6.x' into next

* 2.6.x:
  Updated CHANGELOG for 2.6.8rc1
  (#2331) Remove darwinports pkg provider, replace with rewritten macports 
provider
  Fixed #7082 - Added system support for groups
  (#7018) Give more context on the service type's assumptions. Wording tweaks.
  (#7018) explain internals better in service provider documentation
  maint: Fix sqlite3 require to really be optional
  maint: Fix sporadic sqlite error
  (#6818) Stop from getting Rails 3 named_scope deprecation warning
  (#6856) Copy dangling symlinks with 'links => manage' File resource.

Conflicts (Resolved manually):
        lib/puppet/type/group.rb
        spec/unit/indirector/facts/inventory_active_record_spec.rb


Commit: 3dde838ac992571e13262ea29ba3a0eb8152e753
    
https://github.com/puppetlabs/puppet/commit/3dde838ac992571e13262ea29ba3a0eb8152e753
Author: Max Martin <[email protected]>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M CHANGELOG
  R CHANGELOG.old
  R COPYING
  M LICENSE
  R README
  A README.md
  R README.queueing
  R README.rst
  A README.strings
  R autotest/watcher.rb
  M conf/redhat/puppet.spec
  M conf/solaris/pkginfo
  M conf/suse/puppet.spec
  M ext/nagios/naggen
  M ext/puppet-test
  M ext/yaml_nodes.rb
  M install.rb
  M lib/puppet.rb
  M lib/puppet/application.rb
  M lib/puppet/application/agent.rb
  M lib/puppet/application/apply.rb
  A lib/puppet/application/catalog.rb
  M lib/puppet/application/cert.rb
  A lib/puppet/application/certificate.rb
  A lib/puppet/application/certificate_request.rb
  A lib/puppet/application/certificate_revocation_list.rb
  A lib/puppet/application/config.rb
  A lib/puppet/application/configurer.rb
  M lib/puppet/application/describe.rb
  M lib/puppet/application/doc.rb
  A lib/puppet/application/face_base.rb
  A lib/puppet/application/faces.rb
  A lib/puppet/application/facts.rb
  A lib/puppet/application/file.rb
  M lib/puppet/application/filebucket.rb
  A lib/puppet/application/help.rb
  A lib/puppet/application/indirection_base.rb
  M lib/puppet/application/inspect.rb
  A lib/puppet/application/key.rb
  M lib/puppet/application/kick.rb
  M lib/puppet/application/master.rb
  A lib/puppet/application/node.rb
  A lib/puppet/application/parser.rb
  M lib/puppet/application/queue.rb
  A lib/puppet/application/report.rb
  M lib/puppet/application/resource.rb
  A lib/puppet/application/resource_type.rb
  A lib/puppet/application/status.rb
  M lib/puppet/defaults.rb
  A lib/puppet/face.rb
  A lib/puppet/face/catalog.rb
  A lib/puppet/face/catalog/select.rb
  A lib/puppet/face/certificate.rb
  A lib/puppet/face/certificate_request.rb
  A lib/puppet/face/certificate_revocation_list.rb
  A lib/puppet/face/config.rb
  A lib/puppet/face/configurer.rb
  A lib/puppet/face/facts.rb
  A lib/puppet/face/file.rb
  A lib/puppet/face/help.rb
  A lib/puppet/face/help/action.erb
  A lib/puppet/face/help/face.erb
  A lib/puppet/face/help/global.erb
  A lib/puppet/face/indirector.rb
  A lib/puppet/face/key.rb
  A lib/puppet/face/node.rb
  A lib/puppet/face/parser.rb
  A lib/puppet/face/report.rb
  A lib/puppet/face/resource.rb
  A lib/puppet/face/resource_type.rb
  A lib/puppet/face/status.rb
  A lib/puppet/faces/help/action.erb
  A lib/puppet/faces/help/face.erb
  A lib/puppet/faces/help/global.erb
  A lib/puppet/feature/ssh.rb
  M lib/puppet/indirector.rb
  M lib/puppet/indirector/certificate_request/ca.rb
  M lib/puppet/indirector/couch.rb
  M lib/puppet/indirector/rest.rb
  A lib/puppet/interface.rb
  A lib/puppet/interface/action.rb
  A lib/puppet/interface/action_builder.rb
  A lib/puppet/interface/action_manager.rb
  A lib/puppet/interface/face_collection.rb
  A lib/puppet/interface/option.rb
  A lib/puppet/interface/option_builder.rb
  A lib/puppet/interface/option_manager.rb
  M lib/puppet/network/http/api/v1.rb
  M lib/puppet/network/http_server/mongrel.rb
  M lib/puppet/parser/ast/leaf.rb
  M lib/puppet/parser/ast/vardef.rb
  M lib/puppet/parser/functions/extlookup.rb
  M lib/puppet/parser/functions/fqdn_rand.rb
  M lib/puppet/parser/functions/sha1.rb
  M lib/puppet/parser/grammar.ra
  M lib/puppet/parser/parser.rb
  M lib/puppet/parser/resource.rb
  M lib/puppet/parser/scope.rb
  M lib/puppet/parser/templatewrapper.rb
  M lib/puppet/provider/augeas/augeas.rb
  M lib/puppet/provider/cron/crontab.rb
  M lib/puppet/provider/group/directoryservice.rb
  M lib/puppet/provider/group/groupadd.rb
  A lib/puppet/provider/interface/base.rb
  A lib/puppet/provider/interface/cisco.rb
  M lib/puppet/provider/mcx/mcxcontent.rb
  M lib/puppet/provider/nameservice/directoryservice.rb
  A lib/puppet/provider/network_device.rb
  R lib/puppet/provider/package/darwinport.rb
  A lib/puppet/provider/package/macports.rb
  M lib/puppet/provider/package/pkgdmg.rb
  M lib/puppet/provider/user/directoryservice.rb
  A lib/puppet/provider/vlan/cisco.rb
  M lib/puppet/rails/fact_name.rb
  M lib/puppet/rails/inventory_node.rb
  M lib/puppet/resource/type.rb
  M lib/puppet/resource/type_collection.rb
  M lib/puppet/transaction.rb
  M lib/puppet/transaction/event_manager.rb
  M lib/puppet/transaction/report.rb
  M lib/puppet/type.rb
  M lib/puppet/type/augeas.rb
  M lib/puppet/type/cron.rb
  M lib/puppet/type/file/source.rb
  M lib/puppet/type/group.rb
  A lib/puppet/type/interface.rb
  M lib/puppet/type/mcx.rb
  A lib/puppet/type/router.rb
  M lib/puppet/type/service.rb
  A lib/puppet/type/vlan.rb
  M lib/puppet/util/command_line.rb
  M lib/puppet/util/logging.rb
  M lib/puppet/util/monkey_patches.rb
  A lib/puppet/util/network_device.rb
  A lib/puppet/util/network_device/base.rb
  A lib/puppet/util/network_device/cisco.rb
  A lib/puppet/util/network_device/cisco/device.rb
  A lib/puppet/util/network_device/cisco/interface.rb
  A lib/puppet/util/network_device/ipcalc.rb
  A lib/puppet/util/network_device/transport.rb
  A lib/puppet/util/network_device/transport/base.rb
  A lib/puppet/util/network_device/transport/ssh.rb
  A lib/puppet/util/network_device/transport/telnet.rb
  M lib/puppet/util/selinux.rb
  M man/man5/puppet.conf.5
  M spec/integration/application/apply_spec.rb
  M spec/integration/application/doc_spec.rb
  M spec/integration/configurer_spec.rb
  M spec/integration/defaults_spec.rb
  M spec/integration/file_serving/content_spec.rb
  M spec/integration/file_serving/fileset_spec.rb
  M spec/integration/file_serving/metadata_spec.rb
  M spec/integration/file_serving/terminus_helper_spec.rb
  M spec/integration/indirector/catalog/compiler_spec.rb
  M spec/integration/indirector/catalog/queue_spec.rb
  M spec/integration/indirector/direct_file_server_spec.rb
  M spec/integration/indirector/file_content/file_server_spec.rb
  M spec/integration/indirector/file_metadata/file_server_spec.rb
  M spec/integration/indirector/node/ldap_spec.rb
  M spec/integration/network/client_spec.rb
  M spec/integration/network/formats_spec.rb
  M spec/integration/network/handler_spec.rb
  M spec/integration/network/server/mongrel_spec.rb
  M spec/integration/network/server/webrick_spec.rb
  M spec/integration/node/environment_spec.rb
  M spec/integration/node/facts_spec.rb
  M spec/integration/node_spec.rb
  M spec/integration/parser/collector_spec.rb
  M spec/integration/parser/compiler_spec.rb
  M spec/integration/parser/functions/require_spec.rb
  M spec/integration/parser/functions_spec.rb
  M spec/integration/parser/parser_spec.rb
  M spec/integration/parser/ruby_manifest_spec.rb
  M spec/integration/provider/mailalias/aliases_spec.rb
  M spec/integration/provider/mount_spec.rb
  M spec/integration/provider/package_spec.rb
  M spec/integration/provider/service/init_spec.rb
  M spec/integration/reference/providers_spec.rb
  M spec/integration/reports_spec.rb
  M spec/integration/resource/catalog_spec.rb
  M spec/integration/resource/type_collection_spec.rb
  M spec/integration/ssl/certificate_authority_spec.rb
  M spec/integration/ssl/certificate_request_spec.rb
  M spec/integration/ssl/certificate_revocation_list_spec.rb
  M spec/integration/ssl/host_spec.rb
  M spec/integration/transaction/report_spec.rb
  M spec/integration/transaction_spec.rb
  M spec/integration/type/file_spec.rb
  M spec/integration/type/package_spec.rb
  M spec/integration/type/tidy_spec.rb
  M spec/integration/type_spec.rb
  M spec/integration/util/autoload_spec.rb
  M spec/integration/util/feature_spec.rb
  M spec/integration/util/file_locking_spec.rb
  M spec/integration/util/rdoc/parser_spec.rb
  M spec/integration/util/settings_spec.rb
  A spec/lib/puppet/face/basetest.rb
  A spec/lib/puppet/face/huzzah.rb
  M spec/lib/puppet_spec/files.rb
  M spec/lib/puppet_spec/fixtures.rb
  M spec/lib/puppet_spec/verbose.rb
  M spec/monkey_patches/alias_should_to_must.rb
  M spec/monkey_patches/publicize_methods.rb
  M spec/shared_behaviours/all_parsedfile_providers.rb
  M spec/shared_behaviours/file_server_terminus.rb
  M spec/shared_behaviours/file_serving.rb
  M spec/shared_behaviours/memory_terminus.rb
  M spec/shared_behaviours/path_parameters.rb
  A spec/shared_behaviours/things_that_declare_options.rb
  M spec/spec.opts
  M spec/spec_helper.rb
  M spec/unit/agent/locker_spec.rb
  M spec/unit/agent_spec.rb
  M spec/unit/application/agent_spec.rb
  M spec/unit/application/apply_spec.rb
  M spec/unit/application/cert_spec.rb
  A spec/unit/application/certificate_spec.rb
  A spec/unit/application/config_spec.rb
  A spec/unit/application/configurer_spec.rb
  M spec/unit/application/describe_spec.rb
  M spec/unit/application/doc_spec.rb
  A spec/unit/application/face_base_spec.rb
  A spec/unit/application/faces_spec.rb
  M spec/unit/application/filebucket_spec.rb
  A spec/unit/application/indirection_base_spec.rb
  M spec/unit/application/inspect_spec.rb
  M spec/unit/application/kick_spec.rb
  M spec/unit/application/master_spec.rb
  M spec/unit/application/queue_spec.rb
  M spec/unit/application/resource_spec.rb
  M spec/unit/application_spec.rb
  M spec/unit/configurer/downloader_spec.rb
  M spec/unit/configurer/fact_handler_spec.rb
  M spec/unit/configurer/plugin_handler_spec.rb
  M spec/unit/configurer_spec.rb
  M spec/unit/daemon_spec.rb
  M spec/unit/dsl/resource_api_spec.rb
  M spec/unit/dsl/resource_type_api_spec.rb
  A spec/unit/face/catalog_spec.rb
  A spec/unit/face/certificate_request_spec.rb
  A spec/unit/face/certificate_revocation_list_spec.rb
  A spec/unit/face/certificate_spec.rb
  A spec/unit/face/config_spec.rb
  A spec/unit/face/configurer_spec.rb
  A spec/unit/face/facts_spec.rb
  A spec/unit/face/file_spec.rb
  A spec/unit/face/help_spec.rb
  A spec/unit/face/indirector_spec.rb
  A spec/unit/face/key_spec.rb
  A spec/unit/face/node_spec.rb
  A spec/unit/face/report_spec.rb
  A spec/unit/face/resource_spec.rb
  A spec/unit/face/resource_type_spec.rb
  A spec/unit/face_spec.rb
  M spec/unit/file_bucket/dipper_spec.rb
  M spec/unit/file_bucket/file_spec.rb
  M spec/unit/file_collection/lookup_spec.rb
  M spec/unit/file_collection_spec.rb
  M spec/unit/file_serving/base_spec.rb
  M spec/unit/file_serving/configuration/parser_spec.rb
  M spec/unit/file_serving/configuration_spec.rb
  M spec/unit/file_serving/content_spec.rb
  M spec/unit/file_serving/fileset_spec.rb
  M spec/unit/file_serving/indirection_hooks_spec.rb
  M spec/unit/file_serving/metadata_spec.rb
  M spec/unit/file_serving/mount/file_spec.rb
  M spec/unit/file_serving/mount/modules_spec.rb
  M spec/unit/file_serving/mount/plugins_spec.rb
  M spec/unit/file_serving/mount_spec.rb
  M spec/unit/file_serving/terminus_helper_spec.rb
  M spec/unit/indirector/active_record_spec.rb
  M spec/unit/indirector/catalog/active_record_spec.rb
  M spec/unit/indirector/catalog/compiler_spec.rb
  M spec/unit/indirector/catalog/queue_spec.rb
  M spec/unit/indirector/catalog/rest_spec.rb
  M spec/unit/indirector/catalog/yaml_spec.rb
  M spec/unit/indirector/certificate/ca_spec.rb
  M spec/unit/indirector/certificate/file_spec.rb
  M spec/unit/indirector/certificate/rest_spec.rb
  M spec/unit/indirector/certificate_request/ca_spec.rb
  M spec/unit/indirector/certificate_request/file_spec.rb
  M spec/unit/indirector/certificate_request/rest_spec.rb
  M spec/unit/indirector/certificate_revocation_list/ca_spec.rb
  M spec/unit/indirector/certificate_revocation_list/file_spec.rb
  M spec/unit/indirector/certificate_revocation_list/rest_spec.rb
  M spec/unit/indirector/certificate_status/file_spec.rb
  M spec/unit/indirector/certificate_status/rest_spec.rb
  M spec/unit/indirector/code_spec.rb
  M spec/unit/indirector/direct_file_server_spec.rb
  M spec/unit/indirector/envelope_spec.rb
  M spec/unit/indirector/exec_spec.rb
  M spec/unit/indirector/facts/active_record_spec.rb
  M spec/unit/indirector/facts/couch_spec.rb
  M spec/unit/indirector/facts/facter_spec.rb
  M spec/unit/indirector/facts/inventory_active_record_spec.rb
  M spec/unit/indirector/facts/rest_spec.rb
  M spec/unit/indirector/facts/yaml_spec.rb
  M spec/unit/indirector/file_bucket_file/file_spec.rb
  M spec/unit/indirector/file_bucket_file/rest_spec.rb
  M spec/unit/indirector/file_content/file_server_spec.rb
  M spec/unit/indirector/file_content/file_spec.rb
  M spec/unit/indirector/file_content/rest_spec.rb
  M spec/unit/indirector/file_metadata/file_server_spec.rb
  M spec/unit/indirector/file_metadata/file_spec.rb
  M spec/unit/indirector/file_metadata/rest_spec.rb
  M spec/unit/indirector/file_server_spec.rb
  M spec/unit/indirector/file_spec.rb
  M spec/unit/indirector/indirection_spec.rb
  M spec/unit/indirector/inventory/yaml_spec.rb
  M spec/unit/indirector/key/ca_spec.rb
  M spec/unit/indirector/key/file_spec.rb
  M spec/unit/indirector/ldap_spec.rb
  M spec/unit/indirector/memory_spec.rb
  M spec/unit/indirector/node/active_record_spec.rb
  M spec/unit/indirector/node/exec_spec.rb
  M spec/unit/indirector/node/ldap_spec.rb
  M spec/unit/indirector/node/memory_spec.rb
  M spec/unit/indirector/node/plain_spec.rb
  M spec/unit/indirector/node/rest_spec.rb
  M spec/unit/indirector/node/yaml_spec.rb
  M spec/unit/indirector/plain_spec.rb
  M spec/unit/indirector/queue_spec.rb
  M spec/unit/indirector/report/processor_spec.rb
  M spec/unit/indirector/report/rest_spec.rb
  M spec/unit/indirector/report/yaml_spec.rb
  M spec/unit/indirector/request_spec.rb
  M spec/unit/indirector/resource/ral_spec.rb
  M spec/unit/indirector/resource/rest_spec.rb
  M spec/unit/indirector/resource_type/parser_spec.rb
  M spec/unit/indirector/resource_type/rest_spec.rb
  M spec/unit/indirector/rest_spec.rb
  M spec/unit/indirector/run/local_spec.rb
  M spec/unit/indirector/run/rest_spec.rb
  M spec/unit/indirector/ssl_file_spec.rb
  M spec/unit/indirector/status/rest_spec.rb
  M spec/unit/indirector/terminus_spec.rb
  M spec/unit/indirector/yaml_spec.rb
  M spec/unit/indirector_spec.rb
  A spec/unit/interface/action_builder_spec.rb
  A spec/unit/interface/action_manager_spec.rb
  A spec/unit/interface/action_spec.rb
  A spec/unit/interface/face_collection_spec.rb
  A spec/unit/interface/option_builder_spec.rb
  A spec/unit/interface/option_spec.rb
  A spec/unit/interface_spec.rb
  M spec/unit/module_spec.rb
  M spec/unit/network/authconfig_spec.rb
  M spec/unit/network/authstore_spec.rb
  M spec/unit/network/client_spec.rb
  M spec/unit/network/format_handler_spec.rb
  M spec/unit/network/format_spec.rb
  M spec/unit/network/formats_spec.rb
  M spec/unit/network/handler/fileserver_spec.rb
  M spec/unit/network/http/api/v1_spec.rb
  M spec/unit/network/http/compression_spec.rb
  M spec/unit/network/http/handler_spec.rb
  M spec/unit/network/http/mongrel/rest_spec.rb
  M spec/unit/network/http/mongrel_spec.rb
  M spec/unit/network/http/rack/rest_spec.rb
  M spec/unit/network/http/rack/xmlrpc_spec.rb
  M spec/unit/network/http/rack_spec.rb
  M spec/unit/network/http/webrick/rest_spec.rb
  M spec/unit/network/http/webrick_spec.rb
  M spec/unit/network/http_pool_spec.rb
  M spec/unit/network/http_spec.rb
  M spec/unit/network/rest_authconfig_spec.rb
  M spec/unit/network/rights_spec.rb
  M spec/unit/network/server_spec.rb
  M spec/unit/network/xmlrpc/client_spec.rb
  M spec/unit/node/environment_spec.rb
  M spec/unit/node/facts_spec.rb
  M spec/unit/node_spec.rb
  M spec/unit/other/selinux_spec.rb
  M spec/unit/other/transbucket_spec.rb
  M spec/unit/other/transobject_spec.rb
  M spec/unit/parameter/path_spec.rb
  M spec/unit/parameter/value_collection_spec.rb
  M spec/unit/parameter/value_spec.rb
  M spec/unit/parameter_spec.rb
  M spec/unit/parser/ast/arithmetic_operator_spec.rb
  M spec/unit/parser/ast/astarray_spec.rb
  M spec/unit/parser/ast/asthash_spec.rb
  M spec/unit/parser/ast/boolean_operator_spec.rb
  M spec/unit/parser/ast/casestatement_spec.rb
  M spec/unit/parser/ast/collection_spec.rb
  M spec/unit/parser/ast/collexpr_spec.rb
  M spec/unit/parser/ast/comparison_operator_spec.rb
  M spec/unit/parser/ast/definition_spec.rb
  M spec/unit/parser/ast/function_spec.rb
  M spec/unit/parser/ast/hostclass_spec.rb
  M spec/unit/parser/ast/ifstatement_spec.rb
  M spec/unit/parser/ast/in_operator_spec.rb
  M spec/unit/parser/ast/leaf_spec.rb
  M spec/unit/parser/ast/match_operator_spec.rb
  M spec/unit/parser/ast/minus_spec.rb
  M spec/unit/parser/ast/node_spec.rb
  M spec/unit/parser/ast/nop_spec.rb
  M spec/unit/parser/ast/not_spec.rb
  M spec/unit/parser/ast/relationship_spec.rb
  M spec/unit/parser/ast/resource_defaults_spec.rb
  M spec/unit/parser/ast/resource_override_spec.rb
  M spec/unit/parser/ast/resource_reference_spec.rb
  M spec/unit/parser/ast/resource_spec.rb
  M spec/unit/parser/ast/selector_spec.rb
  M spec/unit/parser/ast/vardef_spec.rb
  M spec/unit/parser/ast_spec.rb
  M spec/unit/parser/collector_spec.rb
  M spec/unit/parser/compiler_spec.rb
  M spec/unit/parser/files_spec.rb
  M spec/unit/parser/functions/create_resources_spec.rb
  M spec/unit/parser/functions/defined_spec.rb
  M spec/unit/parser/functions/extlookup_spec.rb
  M spec/unit/parser/functions/fqdn_rand_spec.rb
  M spec/unit/parser/functions/generate_spec.rb
  M spec/unit/parser/functions/include_spec.rb
  M spec/unit/parser/functions/inline_template_spec.rb
  M spec/unit/parser/functions/realize_spec.rb
  M spec/unit/parser/functions/regsubst_spec.rb
  M spec/unit/parser/functions/require_spec.rb
  M spec/unit/parser/functions/shellquote_spec.rb
  M spec/unit/parser/functions/split_spec.rb
  M spec/unit/parser/functions/sprintf_spec.rb
  M spec/unit/parser/functions/tag_spec.rb
  M spec/unit/parser/functions/template_spec.rb
  M spec/unit/parser/functions/versioncmp_spec.rb
  M spec/unit/parser/functions_spec.rb
  M spec/unit/parser/lexer_spec.rb
  M spec/unit/parser/parser_spec.rb
  M spec/unit/parser/relationship_spec.rb
  M spec/unit/parser/resource_spec.rb
  M spec/unit/parser/scope_spec.rb
  M spec/unit/parser/templatewrapper_spec.rb
  M spec/unit/parser/type_loader_spec.rb
  M spec/unit/property/ensure_spec.rb
  M spec/unit/property/keyvalue_spec.rb
  M spec/unit/property/list_spec.rb
  M spec/unit/property/ordered_list_spec.rb
  M spec/unit/property_spec.rb
  M spec/unit/provider/augeas/augeas_spec.rb
  M spec/unit/provider/confine/exists_spec.rb
  M spec/unit/provider/confine/false_spec.rb
  M spec/unit/provider/confine/feature_spec.rb
  M spec/unit/provider/confine/true_spec.rb
  M spec/unit/provider/confine/variable_spec.rb
  M spec/unit/provider/confine_collection_spec.rb
  M spec/unit/provider/confine_spec.rb
  M spec/unit/provider/confiner_spec.rb
  M spec/unit/provider/exec/posix_spec.rb
  M spec/unit/provider/exec/shell_spec.rb
  M spec/unit/provider/group/groupadd_spec.rb
  M spec/unit/provider/group/ldap_spec.rb
  M spec/unit/provider/host/parsed_spec.rb
  A spec/unit/provider/interface/cisco_spec.rb
  M spec/unit/provider/ldap_spec.rb
  M spec/unit/provider/macauthorization_spec.rb
  M spec/unit/provider/mcx/mcxcontent_spec.rb
  M spec/unit/provider/mount/parsed_spec.rb
  M spec/unit/provider/mount_spec.rb
  M spec/unit/provider/naginator_spec.rb
  M spec/unit/provider/nameservice/directoryservice_spec.rb
  A spec/unit/provider/network_device_spec.rb
  M spec/unit/provider/package/aix_spec.rb
  M spec/unit/provider/package/apt_spec.rb
  M spec/unit/provider/package/dpkg_spec.rb
  M spec/unit/provider/package/freebsd_spec.rb
  M spec/unit/provider/package/gem_spec.rb
  M spec/unit/provider/package/hpux_spec.rb
  A spec/unit/provider/package/macports_spec.rb
  M spec/unit/provider/package/nim_spec.rb
  M spec/unit/provider/package/pip_spec.rb
  M spec/unit/provider/package/pkg_spec.rb
  M spec/unit/provider/package/pkgdmg_spec.rb
  M spec/unit/provider/package/yum_spec.rb
  M spec/unit/provider/package/zypper_spec.rb
  M spec/unit/provider/parsedfile_spec.rb
  M spec/unit/provider/selboolean_spec.rb
  M spec/unit/provider/selmodule_spec.rb
  M spec/unit/provider/service/daemontools_spec.rb
  M spec/unit/provider/service/debian_spec.rb
  M spec/unit/provider/service/freebsd_spec.rb
  M spec/unit/provider/service/init_spec.rb
  M spec/unit/provider/service/launchd_spec.rb
  M spec/unit/provider/service/redhat_spec.rb
  M spec/unit/provider/service/runit_spec.rb
  M spec/unit/provider/service/smf_spec.rb
  M spec/unit/provider/service/src_spec.rb
  M spec/unit/provider/service/upstart.rb
  M spec/unit/provider/ssh_authorized_key/parsed_spec.rb
  M spec/unit/provider/sshkey/parsed_spec.rb
  M spec/unit/provider/user/hpux_spec.rb
  M spec/unit/provider/user/ldap_spec.rb
  M spec/unit/provider/user/user_role_add_spec.rb
  M spec/unit/provider/user/useradd_spec.rb
  A spec/unit/provider/vlan/cisco_spec.rb
  M spec/unit/provider/zfs/solaris_spec.rb
  M spec/unit/provider/zone/solaris_spec.rb
  M spec/unit/provider/zpool/solaris_spec.rb
  M spec/unit/provider_spec.rb
  A spec/unit/puppet/provider/README.markdown
  A spec/unit/puppet/type/README.markdown
  M spec/unit/puppet_spec.rb
  M spec/unit/rails/host_spec.rb
  M spec/unit/rails/param_value_spec.rb
  M spec/unit/rails/resource_spec.rb
  M spec/unit/rails_spec.rb
  M spec/unit/relationship_spec.rb
  M spec/unit/reports/http_spec.rb
  M spec/unit/reports/rrdgraph_spec.rb
  M spec/unit/reports/store_spec.rb
  M spec/unit/reports/tagmail_spec.rb
  M spec/unit/reports_spec.rb
  M spec/unit/resource/catalog_spec.rb
  M spec/unit/resource/status_spec.rb
  M spec/unit/resource/type_collection_helper_spec.rb
  M spec/unit/resource/type_collection_spec.rb
  M spec/unit/resource/type_spec.rb
  M spec/unit/resource_spec.rb
  M spec/unit/run_spec.rb
  M spec/unit/simple_graph_spec.rb
  M spec/unit/ssl/base_spec.rb
  M spec/unit/ssl/certificate_authority/interface_spec.rb
  M spec/unit/ssl/certificate_authority_spec.rb
  M spec/unit/ssl/certificate_factory_spec.rb
  M spec/unit/ssl/certificate_request_spec.rb
  M spec/unit/ssl/certificate_revocation_list_spec.rb
  M spec/unit/ssl/certificate_spec.rb
  M spec/unit/ssl/host_spec.rb
  M spec/unit/ssl/inventory_spec.rb
  M spec/unit/ssl/key_spec.rb
  M spec/unit/sslcertificates/ca_spec.rb
  M spec/unit/status_spec.rb
  M spec/unit/transaction/event_manager_spec.rb
  M spec/unit/transaction/event_spec.rb
  M spec/unit/transaction/report_spec.rb
  M spec/unit/transaction/resource_harness_spec.rb
  M spec/unit/transaction_spec.rb
  M spec/unit/transportable_spec.rb
  M spec/unit/type/augeas_spec.rb
  M spec/unit/type/component_spec.rb
  M spec/unit/type/computer_spec.rb
  M spec/unit/type/cron_spec.rb
  M spec/unit/type/exec_spec.rb
  M spec/unit/type/file/checksum_spec.rb
  M spec/unit/type/file/content_spec.rb
  M spec/unit/type/file/ctime.rb
  M spec/unit/type/file/ensure_spec.rb
  M spec/unit/type/file/group_spec.rb
  M spec/unit/type/file/mtime.rb
  M spec/unit/type/file/owner_spec.rb
  M spec/unit/type/file/selinux_spec.rb
  M spec/unit/type/file/source_spec.rb
  M spec/unit/type/file/type.rb
  M spec/unit/type/file_spec.rb
  M spec/unit/type/filebucket_spec.rb
  M spec/unit/type/group_spec.rb
  M spec/unit/type/host_spec.rb
  A spec/unit/type/interface_spec.rb
  M spec/unit/type/macauthorization_spec.rb
  M spec/unit/type/maillist_spec.rb
  M spec/unit/type/mcx_spec.rb
  M spec/unit/type/mount_spec.rb
  M spec/unit/type/nagios_spec.rb
  M spec/unit/type/noop_metaparam_spec.rb
  M spec/unit/type/package_spec.rb
  M spec/unit/type/resources_spec.rb
  M spec/unit/type/schedule_spec.rb
  M spec/unit/type/selboolean_spec.rb
  M spec/unit/type/selmodule_spec.rb
  M spec/unit/type/service_spec.rb
  M spec/unit/type/ssh_authorized_key_spec.rb
  M spec/unit/type/sshkey_spec.rb
  M spec/unit/type/stage_spec.rb
  M spec/unit/type/tidy_spec.rb
  M spec/unit/type/user_spec.rb
  A spec/unit/type/vlan_spec.rb
  M spec/unit/type/whit_spec.rb
  M spec/unit/type/zfs_spec.rb
  M spec/unit/type/zone_spec.rb
  M spec/unit/type/zpool_spec.rb
  M spec/unit/type_spec.rb
  M spec/unit/util/autoload/file_cache_spec.rb
  M spec/unit/util/autoload_spec.rb
  M spec/unit/util/backups_spec.rb
  M spec/unit/util/cache_accumulator_spec.rb
  M spec/unit/util/cacher_spec.rb
  M spec/unit/util/checksums_spec.rb
  M spec/unit/util/command_line_spec.rb
  M spec/unit/util/constant_inflector_spec.rb
  M spec/unit/util/errors_spec.rb
  M spec/unit/util/execution_spec.rb
  M spec/unit/util/execution_stub_spec.rb
  M spec/unit/util/feature_spec.rb
  M spec/unit/util/file_locking_spec.rb
  M spec/unit/util/filetype_spec.rb
  M spec/unit/util/inline_docs_spec.rb
  M spec/unit/util/ldap/connection_spec.rb
  M spec/unit/util/ldap/generator_spec.rb
  M spec/unit/util/ldap/manager_spec.rb
  M spec/unit/util/loadedfile_spec.rb
  M spec/unit/util/log/destinations_spec.rb
  M spec/unit/util/log_spec.rb
  M spec/unit/util/logging_spec.rb
  M spec/unit/util/metric_spec.rb
  M spec/unit/util/monkey_patches_spec.rb
  M spec/unit/util/nagios_maker_spec.rb
  A spec/unit/util/network_device/cisco/device_spec.rb
  A spec/unit/util/network_device/cisco/interface_spec.rb
  A spec/unit/util/network_device/ipcalc_spec.rb
  A spec/unit/util/network_device/transport/base_spec.rb
  A spec/unit/util/network_device/transport/ssh_spec.rb
  A spec/unit/util/network_device/transport/telnet_spec.rb
  M spec/unit/util/package_spec.rb
  M spec/unit/util/posix_spec.rb
  M spec/unit/util/pson_spec.rb
  M spec/unit/util/queue/stomp_spec.rb
  M spec/unit/util/queue_spec.rb
  M spec/unit/util/rdoc/parser_spec.rb
  M spec/unit/util/rdoc_spec.rb
  M spec/unit/util/reference_serializer_spec.rb
  M spec/unit/util/resource_template_spec.rb
  M spec/unit/util/run_mode_spec.rb
  M spec/unit/util/selinux_spec.rb
  M spec/unit/util/settings/file_setting_spec.rb
  M spec/unit/util/settings_spec.rb
  M spec/unit/util/storage_spec.rb
  M spec/unit/util/tagging_spec.rb
  M spec/unit/util/user_attr_spec.rb
  M spec/unit/util/warnings_spec.rb
  M spec/unit/util/zaml_spec.rb
  A spec/watchr.rb
  M test/language/functions.rb
  M test/language/parser.rb
  M test/language/scope.rb
  M test/test

Log Message:
-----------
Merge branch 'next'

* next: (204 commits)
  Revert "(#6928) Removed --ignoreimport"
  Updated CHANGELOG for 2.6.8rc1
  (#6928) Removed --ignoreimport
  (#6928) Remove --parseonly
  (#6928) Add a Parser face with Validate action
  (#6830) Fix sha1 to digest/sha1 require issue for Ruby 1.9
  (#6830) Fix UTF-8 encoding issue for Ruby 1.9
  (#6830) Fix string method sub call on a symbol for Ruby 1.9
  (#2331) Remove darwinports pkg provider, replace with rewritten macports 
provider
  (#7059) handle inherited action binding scope
  maint: ensure we handle '-foo=' options correctly in faces.
  (#2150) Fix File const lookup when configuring routes
  Fixed #7082 - Added system support for groups
  maint: install erb templates under lib/
  maint: clean up the spec test headers in bulk.
  (#7056) Use 'face' rather than 'faces' in the production code.
  maint: eliminate deprecated since 2008 code from Puppet.
  (#6117) Add POST support to indirector requests
  (#6962) Move option handling into #parse_options, not #preinit.
  maint: whitespace cleanup for puppet/util/command_line.
  ...


Commit: 97e9e5f223cb7baefd52456e2324c592fe415dca
    
https://github.com/puppetlabs/puppet/commit/97e9e5f223cb7baefd52456e2324c592fe415dca
Author: Max Martin <[email protected]>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M CHANGELOG
  M lib/puppet.rb

Log Message:
-----------
Updated CHANGELOG & version for 2.7.0rc1


Compare: https://github.com/puppetlabs/puppet/compare/7817ccb...97e9e5f

-- 
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