tree 9a506f1e4f01714d06a631fbf4b9371091da70c1
parent 076ecb1d00dafa7030e0facade283f41fa86e43b
parent 1a3fb79d5a78ad772f11b4a121b66c22ab1ba855
author Steve Loughran <stevel@apache.org> 1448295373 +0000
committer Steve Loughran <stevel@apache.org> 1448295373 +0000

Merge branch 'develop' into feature/SLIDER-82-pass-3.1

# Conflicts:
#	slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
#	slider-core/src/test/groovy/org/apache/slider/client/TestClientBadArgs.groovy