Permalink
Commits on Nov 26, 2012
  1. updated net-ssh version

    Sam Marx committed Nov 26, 2012
Commits on Nov 21, 2012
  1. Merge branch 'pty-on-linux'

    danielsdeleo committed Nov 21, 2012
  2. Fix chef-shell for log_level == :auto

    Also add functional regression tests
    danielsdeleo committed Nov 20, 2012
Commits on Nov 20, 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/encrypted_data_bag_item.rb
    	chef/spec/unit/encrypted_data_bag_item_spec.rb
    	ci/jenkins_run_tests.bat
    	ci/jenkins_run_tests.sh
    	lib/chef/provider.rb
    	spec/unit/knife/data_bag_from_file_spec.rb
    	spec/unit/provider/remote_directory_spec.rb
    	spec/unit/provider/route_spec.rb
    btm committed Nov 20, 2012
Commits on Nov 19, 2012
  1. fix binread for ruby 1.8

    danielsdeleo committed Nov 19, 2012
  2. try running functional tests first

    ...should help avoid pollution of global state from unit tests
    danielsdeleo committed Nov 15, 2012
Commits on Nov 17, 2012
  1. Merge branch 'CHEF-3617'

    schisamo committed Nov 17, 2012
Commits on Nov 16, 2012
  1. [CHEF-3616] add cipher field to edbi metadata

    Adds back compat support for adding the "cipher" field to encrypted data
    bag v1 format.
    danielsdeleo committed Nov 16, 2012
  2. Merge branch 'CHEF-3616'

    danielsdeleo committed Nov 16, 2012
  3. [CHEF-3616] add cipher field to edbi metadata

    Adds "cipher" to the metadata fields for encrypted data bag items. This
    enables user-configurable ciphers in the future. Cipher is still
    hard-coded to aes-256-cbc for now.
    danielsdeleo committed Nov 16, 2012
Commits on Nov 15, 2012
  1. Merge branch 'CHEF-3392'

    danielsdeleo committed Nov 15, 2012