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.

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

Move fixes from 0.1 branch up to master. #15

Merged
merged 5 commits into from Aug 27, 2013
Merged

Move fixes from 0.1 branch up to master. #15

merged 5 commits into from Aug 27, 2013

Conversation

jheretic
Copy link
Member

There are a number of fixes that were pushed directly into 0.1 before the best practices doc was established. This will merge these 5 additional fixes into the master branch as well in preparation for a new release branch.

jheretic and others added 5 commits May 22, 2013 16:26
Signed-off-by: Josh King <jking@chambana.net>
Signed-off-by: Josh King <jking@chambana.net>
added dhcp timeout form field to meshconfig cbi page

tested by areynold
@ghost ghost assigned areynold Aug 27, 2013
jheretic added a commit that referenced this pull request Aug 27, 2013
Move fixes from 0.1 branch up to master. Tested.
@jheretic jheretic merged commit 1d9ac67 into master Aug 27, 2013
seamustuohy pushed a commit that referenced this pull request Jun 5, 2014
…ull-3

Branch tested and ready for merging.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants