Neil, I had already committed it to master.
There were some merge conflicts with the CHANGELOG for the 1.1.x branch. So, I had asked Till to resolve them and then commit it. -anand On Oct 28, 2016, at 1:23 PM, Neil Conway <neil.con...@gmail.com> wrote: This commit should also appear in the master branch, not just 1.1.x Neil On Fri, Oct 28, 2016 at 4:06 PM, <ti...@apache.org> wrote: Repository: mesos Updated Branches: refs/heads/1.1.x bc7ecb8cf -> 7fce1b33f Added MESOS-6497 to CHANGELOG. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7fce1b33 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7fce1b33 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7fce1b33 Branch: refs/heads/1.1.x Commit: 7fce1b33fd7b0ef3f8dcfaa2d6557da1e3c6f957 Parents: bc7ecb8 Author: Till Toenshoff <toensh...@me.com> Authored: Fri Oct 28 20:23:48 2016 +0200 Committer: Till Toenshoff <toensh...@me.com> Committed: Fri Oct 28 22:03:39 2016 +0200 ---------------------------------------------------------------------- CHANGELOG | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/7fce1b33/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 3f03be0..d0a679d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -213,6 +213,7 @@ All Issues: * [MESOS-6446] - WebUI redirect doesn't work with stats from /metric/snapshot. * [MESOS-6482] - Master check failure when marking an agent unreachable. * [MESOS-6483] - Check failure when a 1.1 master marking a 0.28 agent as unreachable. + * [MESOS-6497] - Java Scheduler Adapter does not surface MasterInfo. ** Documentation * [MESOS-5221] - Add Documentation for Nvidia GPU support.
