Permalink
Commits on Nov 6, 2012
  1. Merge branch 'immediate-converge-action'

    tylercloke committed Nov 6, 2012
  2. [CHEF-3564] Added a remote_directory test

    that ensures that the new_resouce.updated_by_last_action state is properly captured when the dir contents change and when they don't.
    tylercloke committed Nov 5, 2012
  3. Finished refactoring converge and updated tests

    so that converge and converge! are no longer a method in the provider and why_run, respectively. There is instead set_updated_status in provider. Everything is now converged in why_run's add_action, so neither of the converge methods should ever need to be called. Updated tests to reflect this. Removed all calls to converge, and replaced with set_updated_status only for tests that are looking at the update status of a provider, where the converge behavior has been mocked out.
    tylercloke committed Nov 5, 2012
  4. Fixed CHEF-3564 so that remote_directory

    is not longer updated_by_last_action on every run by only putting converge_by blocks in places where remote_dir would directly execute code.
    tylercloke committed Nov 2, 2012
Commits on Nov 5, 2012
  1. Merge branch 'OC-4668'

    danielsdeleo committed Nov 5, 2012
  2. [OC-4668] cleanup revision deploy tests

    * Use a single file to track order of operations between different steps
      in the tests
    * Use symbolic names when tracking order of operations so it's more
      human readable
    * Mark tests as unix_only, deploy doesn't support windows
    * Add tests that run a "migration"
    danielsdeleo committed Nov 5, 2012
Commits on Nov 2, 2012
  1. Merge branch 'CHEF-3499'

    danielsdeleo committed Nov 2, 2012
  2. Move func test from f0db9a to the right spot

    The merge from 10-stable left this out on a limb because of the directory
    structure change.
    btm committed Nov 2, 2012
  3. Merge branch 'CHEF-2936'

    danielsdeleo committed Nov 2, 2012
  4. [CHEF-2936] ensure all default and override attrs go in node json

    default and override attributes are now split into components, so all
    the components need to be merged together to generate the serialized
    representation of a node. Unfortunately, this means that serializing a
    node is now lossy because the information about which component default
    and override attributes belong to is lost. In practice, this is not a
    major issue, since automatic, override, and default attributes are
    cleared by chef for each run.
    danielsdeleo committed Oct 25, 2012
  5. [CHEF-2936] apply attributes at run list expansion

    Role and environment default/override attributes are now set on the node
    at run_list expansion time, using the appropriate new attribute
    components on Node::Attribute.
    danielsdeleo committed Oct 25, 2012
  6. [CHEF-2936] add role and environment components to Node::Attribute

    I reformatted Chef::Node::Attribute because the indentation was busted.
    The actual code change is that Attribute now has components for
    role_default, env_default, role_override, and env_override, and merges
    them according to the precedence given in the documentation.
    
    These new components are not yet wired in to Chef::Node, however.
    danielsdeleo committed Oct 25, 2012
Commits on Nov 1, 2012
  1. Merge pull request #459 from opscode/lcg/OC-4573

    removing daemonize option for windows
    lamont-granquist committed Nov 1, 2012
  2. Merge branch 'OC-3553'

    danielsdeleo committed Nov 1, 2012
  3. [OC-3553] add 304 NotModified support to raw_http_request

    304 support was previously in #run_request, which is deprecated and
    going away. To support If-Modified-Since in the http_request resource,
    we need to add support for 304 to the api we're keeping.
    danielsdeleo committed Oct 22, 2012
  4. [OC-3553] remove _rest from REST method names, add aliases

    It's redundant to have _rest in the method names, the class is named
    REST. ...that said, a ton of code uses the old method names, so add
    aliases for compatibility.
    danielsdeleo committed Oct 22, 2012
Commits on Oct 30, 2012
  1. Merge branch '10-stable'

    Conflicts:
    	chef-expander/lib/chef/expander/version.rb
    	chef-server-api/lib/chef-server-api/version.rb
    	chef-server-webui/lib/chef-server-webui/version.rb
    	chef-server/lib/chef-server/version.rb
    	chef-solr/lib/chef/solr/version.rb
    	chef/lib/chef/node/attribute.rb
    	lib/chef/node.rb
    btm committed Oct 30, 2012