tree a5c4432330fc303a3498ab8155deec6b82c6f1c6
parent 40c451e29688ce9c21abcf48e0ba226a4a02df44
parent 6de357cc8926877fae4d51641c4b1fb102e0938a
author Billie Rinaldi <billie.rinaldi@gmail.com> 1468352355 -0700
committer Billie Rinaldi <billie.rinaldi@gmail.com> 1468352355 -0700

Merge branch 'develop' into feature/SLIDER-1107_AM_config_generation

Conflicts:
	slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java