[48/50] [abbrv] Merge branch 'master' into rbac.

2014-03-13 Thread mchen
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/network/as/AutoScaleManagerImpl.java -- diff --cc server/src/com/cloud/network/as/AutoScaleManagerImpl.java index e07e502,2fa3821..755fc54 --- a/s

[48/50] [abbrv] Merge branch 'master' into rbac.

2013-10-31 Thread mchen
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ef4d520/server/src/com/cloud/api/query/QueryManagerImpl.java -- diff --cc server/src/com/cloud/api/query/QueryManagerImpl.java index 80a2227,51ee249..7ab2298 --- a/server/src/