Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
* 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode: GEODE-2157: Fixing sanctionedSerializables for PutAllPartialResultEx Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/59284599 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/59284599 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/59284599 Branch: refs/heads/develop Commit: 5928459918617613dfaf39a03512630ed66aea95 Parents: 4b0544c 423e04f Author: Dave Barnes <dbar...@pivotal.io> Authored: Wed Nov 30 16:54:09 2016 -0800 Committer: Dave Barnes <dbar...@pivotal.io> Committed: Wed Nov 30 16:54:09 2016 -0800 ---------------------------------------------------------------------- .../org/apache/geode/codeAnalysis/sanctionedSerializables.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
