tree b495fdbceea37e99ca918136b2bcd10d76ac10f2
parent ab90508c3f171809c38edbd7295777fe33ac5048
parent 058e64d497d5d767c4e907d3463fa05a2b1011f9
author Steve Loughran <stevel@apache.org> 1449678504 +0000
committer Steve Loughran <stevel@apache.org> 1449679532 +0000

Merge branch 'develop' into 2.3-yj: this picks up SLIDER-82, Anti-Affinity

# Conflicts:
#	app-packages/hbase/appConfig-default.json
#	slider-core/src/main/java/org/apache/slider/client/SliderClient.java
#	slider-core/src/main/java/org/apache/slider/client/SliderClientAPI.java
#	slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java
#	slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
#	slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentWebPagesIT.groovy