Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

knife-ec2 master to knife-ec2 knife-cloud sync #71

Merged
merged 8 commits into from
Jul 22, 2014
Merged

knife-ec2 master to knife-ec2 knife-cloud sync #71

merged 8 commits into from
Jul 22, 2014

Commits on Jun 24, 2014

  1. knife-ec2 master to knife-ec2 knife-cloud sync

    @prabhu-das
    prabhu-das committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    298a08d View commit details
    Browse the repository at this point in the history

  2. fixing vpc_mode issue

    @prabhu-das
    prabhu-das committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    2661838 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2014

  1. Merge pull request #75 from opscode/sid-ssh-override-winrm-config 

    [knife-cloud] Common short options in ssh & winrm (SSH override winrm config)
    Mukta Aphale committed Jul 17, 2014
    Configuration menu
    Copy the full SHA
    d41c613 View commit details
    Browse the repository at this point in the history

  2. knife-ec2 master to knife-ec2 knife-cloud sync

    @prabhu-das
    prabhu-das authored and siddheshwar-more committed Jul 17, 2014
    Configuration menu
    Copy the full SHA
    5cef1a3 View commit details
    Browse the repository at this point in the history

  3. fixing vpc_mode issue

    @prabhu-das
    prabhu-das authored and siddheshwar-more committed Jul 17, 2014
    Configuration menu
    Copy the full SHA
    b3ea927 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2014

  1. Added changes related to ssh_gateway configuration for bootstrap

    @prabhu-das
    prabhu-das committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    aae0ef2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pd-ec2_sync_master' of https://github.com/opscode/knife… 

    …-cloud into pd-ec2_sync_master

Conflicts:
	lib/chef/knife/cloud/chefbootstrap/ssh_bootstrap_protocol.rb
	spec/unit/ssh_bootstrap_protocol_spec.rb
    @prabhu-das
    prabhu-das committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    dd17fd5 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2014

  1. removed unwanted puts log

    @prabhu-das
    prabhu-das committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    b61156c View commit details
    Browse the repository at this point in the history