Merge branch 'feature/SLIDER-600-robust-history-reader' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/96360248 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/96360248 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/96360248 Branch: refs/heads/develop Commit: 963602489dfeaebf01712d343da3b94d3aaa1fa7 Parents: 8dc94a7 c425524 Author: Steve Loughran <[email protected]> Authored: Thu Apr 9 13:35:28 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Thu Apr 9 13:35:28 2015 +0100 ---------------------------------------------------------------------- .../slider/server/avro/RoleHistoryRecord.avsc | 17 +- .../server/appmaster/state/RoleHistory.java | 94 ++++++++-- .../slider/server/avro/LoadedRoleHistory.java | 81 ++++++++ .../slider/server/avro/RoleHistoryWriter.java | 183 ++++++++++--------- .../TestMockAppStateFlexDynamicRoles.groovy | 13 +- .../model/history/TestRoleHistoryRW.groovy | 79 +++++++- .../slider/server/avro/history-v01-3-role.json | 6 + .../slider/server/avro/history-v01-6-role.json | 8 + 8 files changed, 370 insertions(+), 111 deletions(-) ----------------------------------------------------------------------
