# This is a combination of 4 commits.
# The first commit's message is:
# This is a combination of 3 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 4 commits.
# The first commit's message is:
Revert "Config UI: Change stage summary to include stage progress, running time"

This reverts commit eba6cb4ae7f5171a88f8db1fceb6396cf48a5efe.

# The 2nd commit message will be skipped:

#	revert the update to freemarker library
#
#	Signed-off-by: ywang19 <yaguang.wang@intel.com>

# The 3rd commit message will be skipped:

#	enable configuration inheritance

# The 4th commit message will be skipped:

#	resolve swift test 401 error code

# The 2nd commit message will be skipped:

#	correct wrong log level in cosbench-mock and cosbench-swift

# The 2nd commit message will be skipped:

#	remove the improper implementation on controller side

# The 3rd commit message will be skipped:

#	refine driver state on controller web interface

# The 2nd commit message will be skipped:

#	add ui support on controller web

# The 3rd commit message will be skipped:

#	revert the update to freemarker library
#
#	Signed-off-by: ywang19 <yaguang.wang@intel.com>

# The 4th commit message will be skipped:

#	enable configuration inheritance
Merge branch '0.4.0.1' of https://github.com/xiaoerlyl/cosbench into 0.4.0.1