Re: [MERGE] Browser based template or volume upload

2015-04-29 Thread Daan Hoogland
yes, that's how travis does it. On Wed, Apr 29, 2015 at 5:46 AM, Rajani Karuturi raj...@apache.org wrote: Hi Daan, I will resolve the conflicts and will put up another pull request. Though travis is green, looks like it ran on the branch instead of after doing the merge. Thanks, ~Rajani

Re: [MERGE] Browser based template or volume upload

2015-04-28 Thread Rajani Karuturi
Hi Daan, I will resolve the conflicts and will put up another pull request. Though travis is green, looks like it ran on the branch instead of after doing the merge. Thanks, ~Rajani On Tue, Apr 28, 2015 at 1:05 PM, Daan Hoogland daan.hoogl...@gmail.com wrote: Rajani et al, Great effort.

[MERGE] Browser based template or volume upload

2015-04-28 Thread Rajani Karuturi
We worked on below proposal for Browser based template or volume upload. development effort from @bvbharat, Koushik Das and @karuturi UI help from @bfederle , Jessica Wang and @rags22489664 testing effort from Deepthi Machiraju and @sailajamada We believe this feature is ready to merge. If you

Re: [MERGE] Browser based template or volume upload

2015-04-28 Thread Daan Hoogland
Rajani et al, Great effort. Apache jenkins doesn't merge the pull request cleanly so maybe a more careful manual merge is required. please go ahead. Travis is fine and of course always right;) On Tue, Apr 28, 2015 at 8:20 AM, Rajani Karuturi raj...@apache.org wrote: We worked on below proposal