# This is a combination of 6 commits.
# The first commit's message is:
# This is a combination of 7 commits.
# The first commit's message is:
add disk to vm example

# This is the 2nd commit message:

pep8 fixes

# This is the 3rd commit message:

travis

# This is the 4th commit message:

more travis

# This is the 5th commit message:

travis

# This is the 6th commit message:

set args to required, avoid unneeded if statement

# This is the 7th commit message:

fix over indent

# This is the 2nd commit message:

add disk to vm example

# This is the 3rd commit message:

add disk to vm example

# This is the 4th commit message:

add disk to vm example

# This is the 5th commit message:

# This is a combination of 2 commits.
# The first commit's message is:

add disk to vm example

# This is the 2nd commit message:

set args to required, avoid unneeded if statement

# This is the 6th commit message:

add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
add disk to vm example
# This is a combination of 2 commits.
# The first commit's message is:

add disk to vm example

# This is the 2nd commit message:

white space
add disk to vm example
Merge branch 'add-disk' of github.com:whereismyjetpack/pyvmomi-community-samples into add-disk

Conflicts:
	samples/add_disk_to_vm.py