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

# This is a combination of 15 commits.
# The first commit's message is:
# 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

# The 2nd commit message will be skipped:

#	add disk to vm example

# The 3rd commit message will be skipped:

#	add disk to vm example

# The 4th commit message will be skipped:

#	add disk to vm example

# The 5th commit message will be skipped:

#	add disk to vm example

# The 6th commit message will be skipped:

#	add disk to vm example

# The 7th commit message will be skipped:

#	add disk to vm example

# The 8th commit message will be skipped:

#	add disk to vm example

# The 9th commit message will be skipped:

#	add disk to vm example

# The 10th commit message will be skipped:

#	add disk to vm example

# The 11th commit message will be skipped:

#	add disk to vm example

# The 12th commit message will be skipped:

#	add disk to vm example

# The 13th commit message will be skipped:

#	add disk to vm example

# The 14th commit message will be skipped:

#	# 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

# The 15th commit message will be skipped:

#	add disk to vm example

# The 2nd commit message will be skipped:

#	white space

# The 2nd commit message will be skipped:

#	add disk to vm example

# The 3rd commit message will be skipped:

#	add disk to vm example

# The 4th commit message will be skipped:

#	# 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

# The 5th commit message will be skipped:

#	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