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

For centos #14

Merged
merged 4 commits into from
Jan 13, 2014
Merged

For centos #14

merged 4 commits into from
Jan 13, 2014

Commits on Dec 12, 2013

  1. change for centos "ip link set master" to "brctl"

    @WhiteAnthrax
    WhiteAnthrax committed Dec 12, 2013
    Configuration menu
    Copy the full SHA
    41a3fbf View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2013

  1. if ip link set is failed, then try brctl addif.

    @WhiteAnthrax
    WhiteAnthrax committed Dec 13, 2013
    Configuration menu
    Copy the full SHA
    777137e View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2014

  1. Merge remote-tracking branch 'upstream/master' into for-centos 

    Conflicts:
	pipework
    @WhiteAnthrax
    WhiteAnthrax committed Jan 7, 2014
    Configuration menu
    Copy the full SHA
    9cefdcc View commit details
    Browse the repository at this point in the history

  2. rebase master

    @WhiteAnthrax
    WhiteAnthrax committed Jan 7, 2014
    Configuration menu
    Copy the full SHA
    2ef2613 View commit details
    Browse the repository at this point in the history