Add Controller scale param to merge.py
authorGregory Haynes <greg@greghaynes.net>
Wed, 16 Apr 2014 21:14:47 +0000 (14:14 -0700)
committerRobert Collins <rbtcollins@hp.com>
Wed, 28 May 2014 03:08:47 +0000 (15:08 +1200)
commitd44a3e2342bc14754c8bb70c4a4559d563d355c0
treee07640a18b70fe7d12d95fc28f9027d81cdd41e7
parent9b7099a4b49cf68caa2ea54ef9d02a1ad640b257
Add Controller scale param to merge.py

We need a paremeter to attempt scaling of the Controller resources in
merge.py.

Change-Id: I4a79059e72850da4a5a3fe30dbb9df92a9dca212
Makefile