commit 230cf1649b2dbc47ee63c7c1b9855a3da2539f3a
Author: Eric Ayers <zundel@squareup.com>
Date:   Wed Jun 1 14:33:30 2016 -0400

    Rename PARALLEL_BOTH to PARALLEL_CLASSES_AND_METHODS inside JUnit Runner
    
    Feedback in https://rbcommons.com/s/twitter/r/3925/ was to rename PARALLEL_BOTH to prevent confusion if we were to add more concurrency options in the future.
    
    This just changes the junit-runner java code so that we can publish a new jar and make the corresponding updates in pants python code.
    
    Testing Done:
    CI green at https://travis-ci.org/pantsbuild/pants/builds/134416147
    
    Bugs closed: 3536
    
    Reviewed at https://rbcommons.com/s/twitter/r/3962/

 ...rallelMethods.java => TestParallelClassesAndMethods.java} | 12 ++++++------
 .../pantsbuild/junit/annotations/TestParallelMethods.java    |  5 +++--
 src/java/org/pantsbuild/junit/annotations/TestSerial.java    |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)