geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [43/43] geode git commit: Resolve conflict
Date Tue, 30 May 2017 17:42:35 GMT
Resolve conflict


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/283215f9
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/283215f9
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/283215f9

Branch: refs/heads/feature/GEODE-2632-17
Commit: 283215f9f348918cec2b85e97eb2aec977f10492
Parents: 91c13da
Author: Kirk Lund <klund@apache.org>
Authored: Tue May 30 10:41:29 2017 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Tue May 30 10:41:29 2017 -0700

----------------------------------------------------------------------
 .../sanctionedDataSerializables.txt             | 1074 +++++++++---------
 1 file changed, 535 insertions(+), 539 deletions(-)
----------------------------------------------------------------------



Mime
View raw message