> On Nov. 13, 2015, 8:42 a.m., Joshua Cohen wrote:
> > pants.ini, lines 27-29
> > <https://reviews.apache.org/r/40197/diff/1/?file=1123612#file1123612line27>
> >
> >     When I went to commit this change, I got a merge conflict applying the 
> > patch. According to git, these lines are not found in pants.ini on 
> > [master](https://github.com/apache/aurora/blob/master/pants.ini)? And just 
> > to be sure, this is not a github mirroring issue, Apache's git shows the 
> > [same 
> > thing](https://git-wip-us.apache.org/repos/asf?p=aurora.git;a=blob;f=pants.ini;h=22f6c59dd93c1a4a2ca78c216e1fd3f3f6c8b752;hb=HEAD).

Ah yes - makes sense.  Had a lot of changes in flight and this one nuked that: 
https://git1-us-west.apache.org/repos/asf?p=aurora.git;a=commit;h=b4102def

I'll rebase and post the new diff.


- John


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


On Nov. 11, 2015, 1:30 p.m., John Sirois wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/40197/
> -----------------------------------------------------------
> 
> (Updated Nov. 11, 2015, 1:30 p.m.)
> 
> 
> Review request for Aurora, Joshua Cohen and Bill Farner.
> 
> 
> Bugs: AURORA-547
>     https://issues.apache.org/jira/browse/AURORA-547
> 
> 
> Repository: aurora
> 
> 
> Description
> -------
> 
> The Aurora python tests cannot currently all be run together; so the ci
> script passes --no-fast and devs need to remember to do this too.
> Improve the dev experience by defaulting this option.
> 
>  build-support/jenkins/build.sh | 2 +-
>  pants.ini                      | 7 +++++++
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> 
> Diffs
> -----
> 
>   build-support/jenkins/build.sh 5cd5242a2e4551e356e5ce5d15a0d27beb7e2d4e 
>   pants.ini 0bd8ec829ae65e2296a122166dea13f315323c9f 
> 
> Diff: https://reviews.apache.org/r/40197/diff/
> 
> 
> Testing
> -------
> 
> Ran into this working https://issues.apache.org/jira/browse/AURORA-547.
> After the fix, locally ran `./pants test src/test/python:: -- -v` green.
> Previously this would lead to test failures and CPU starvation.
> 
> 
> Thanks,
> 
> John Sirois
> 
>

Reply via email to