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

Merge Snapshots #8

Open
wants to merge 54 commits into
base: snap
Choose a base branch
from
Open

Merge Snapshots #8

wants to merge 54 commits into from

Conversation

benjsc
Copy link

@benjsc benjsc commented Dec 24, 2013

Any chance of merging the snapshot branch. I've pulled it up to date to work with V4.3 and merged together quite a few changes that have taken place since the branch began.

ndeloof and others added 30 commits April 6, 2012 18:21
Add VirtualBox 4.2 support
Change-Id: Ic4a4fd2528d3559cb11eb382571e1bc2f3558fff
Change-Id: Ia051397b67d5e8f38ab1039dfafba8181d7869c7
Conflicts:
	README.txt
	plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV40.java
	plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV41.java

Change-Id: I1b7da36a3357ed207f7fe1a8ec171d69ea158b6d
Oscar Carlsson and others added 24 commits July 31, 2013 09:41
Change-Id: I1680d8603ac44f500038433a675a3bd4189954b1
Change-Id: Ica7391b1ee0c859a1e9813dd84268a5cb6c4cf8e
Change-Id: I24b10363696988284fdbdae6f41f4f2bf5da42c4
Change-Id: I08f6aa8d9dd05dc9933d5f4648831755cecf25a5
Update to VirtualBox 4.3
Update VBox 4.3 Control
Conflicts:
	README.txt
	plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV40.java
	plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV41.java
Conflicts:
	plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxUtils.java
Conflicts:
	README.txt
	plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV40.java
	plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV41.java
@cloudbees-pull-request-builder

plugins » virtualbox-plugin #21 SUCCESS
This pull request looks good

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.

7 participants