Edison Su 3aa9a312b4 seems netapp part of code is missing due to merge
Revert "bug 10837: rename api related to netapp"

This reverts commit 5db6b500dd1bbb96bfddbd7eda6cf1f616e2e0f9.

Conflicts:

	api/src/com/cloud/api/commands/MigrateVolumeCmd.java
	client/tomcatconf/commands-ext.properties.in
2012-01-12 15:17:27 -08:00
..
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2011-08-23 19:52:19 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2011-07-11 14:19:35 -07:00
2010-08-11 09:13:29 -07:00
2011-08-23 19:52:19 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00