Merge branch 'feature/GEODE-2047' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3822c905 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3822c905 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3822c905 Branch: refs/heads/feature/GEODE-1930 Commit: 3822c9053fbb85893e68d3e906c6a6b8aaefe3e0 Parents: 3bdd104 8f14a74 Author: Karen Miller <kmil...@pivotal.io> Authored: Tue Nov 1 13:53:43 2016 -0700 Committer: Karen Miller <kmil...@pivotal.io> Committed: Tue Nov 1 13:53:43 2016 -0700 ---------------------------------------------------------------------- .../handling_network_partitioning.html.md.erb | 28 +++++++++++--------- ...rk_partitioning_management_works.html.md.erb | 7 +++-- ...ring_conflicting_data_exceptions.html.md.erb | 4 +-- .../recovering_from_network_outages.html.md.erb | 11 ++------ .../system_failure_and_recovery.html.md.erb | 6 ++--- .../topics/gemfire_properties.html.md.erb | 4 +-- 6 files changed, 27 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
