> On Jan. 13, 2014, 10:56 p.m., Joe Smith wrote:
> > src/webui/master/static/home.html, line 119
> > <https://reviews.apache.org/r/16787/diff/6/?file=421979#file421979line119>
> >
> >     looks like a merge issue?

Yup, that's what I get for being dismissive. Thanks for catching that!


- Thomas


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/16787/#review31666
-----------------------------------------------------------


On Jan. 13, 2014, 11:42 p.m., Thomas Rampelberg wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/16787/
> -----------------------------------------------------------
> 
> (Updated Jan. 13, 2014, 11:42 p.m.)
> 
> 
> Review request for mesos and Ross Allen.
> 
> 
> Bugs: mesos-900
>     https://issues.apache.org/jira/browse/mesos-900
> 
> 
> Repository: mesos-git
> 
> 
> Description
> -------
> 
> Implemented a table directive that allows for sorting and pagination.
> 
> Review: http://reviews.apache.org/r/16787
> 
> 
> Diffs
> -----
> 
>   src/Makefile.am 21df397318fd43f8eab1f0f90f4c1ab5ab873718 
>   src/webui/master/static/directives/pagination.html PRE-CREATION 
>   src/webui/master/static/framework.html 
> f0aff0d12f6f873a72b0e1057a7702d260a7c70c 
>   src/webui/master/static/frameworks.html 
> 1cdd39fdcfbb44070c8bafd49d484423ffeea04f 
>   src/webui/master/static/home.html 336d1188809885317e2e04ebcf306efd4be7c3c5 
>   src/webui/master/static/js/app.js 67e9a3af03783c5c2cd72a1a83b7f0a9cc20c46c 
>   src/webui/master/static/js/controllers.js 
> 064f9ec425538e1a9b32e0b119c9d3178d2bcfb7 
>   src/webui/master/static/offers.html 
> 121fd93b8b93171449932c69f7be6c1a48e58e7f 
>   src/webui/master/static/slave.html 60dc3089f9bcd8d4c3462ebb120d94c733d3e587 
>   src/webui/master/static/slave_executor.html 
> e5501e3038027855523ec95a2abefd1640f668dd 
>   src/webui/master/static/slave_framework.html 
> b597ac59517846b677aa1da5ef6cbb2e1b3a7cd2 
>   src/webui/master/static/slaves.html 
> c729fadd977b551a30484f0765c57432165a3bc0 
> 
> Diff: https://reviews.apache.org/r/16787/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Thomas Rampelberg
> 
>

Reply via email to