Re: schema upgrade in 4.4 not in master

2014-04-30 Thread Daan Hoogland
On Wed, Apr 30, 2014 at 6:44 PM, Sheng Yang wrote: > 4620c27ebf750c840b530d18fed7d8adf857e91 ok, I see. I had a conflict because the change was in a different place then in 4.4. Sorry -- Daan

Re: schema upgrade in 4.4 not in master

2014-04-30 Thread Sheng Yang
It's in the master. See commit: 4620c27ebf750c840b530d18fed7d8adf857e91 in the master branch. --Sheng On Wed, Apr 30, 2014 at 6:38 AM, Daan Hoogland wrote: > Sheng, > > I encountered your commit 3578c7137f42fdcaadad9b263e18921e2fa094da in > 4.4: CLOUDSTACK-6047: Make aggregation command timeou