tree ade56c1a51adcc58975cfceaed5039c44ca8b2d6
parent 704e81363a72444f0d27b6fe3ab43d46b7791231
parent 96177ed0c3822a96944d5c2296788937fdbcf51b
author Sumit Mohanty <smohanty@hortonworks.com> 1426651712 -0700
committer Sumit Mohanty <smohanty@hortonworks.com> 1426651712 -0700

Merge branch 'develop' into feature/package_simplification_II

Conflicts:
	slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java