You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/04 22:57:18 UTC
[18/63] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-17-2
Merge branch 'develop' into feature/GEODE-17-2
# Conflicts:
# geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c235ef84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c235ef84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c235ef84
Branch: refs/heads/feature/GEODE-1276
Commit: c235ef84adae4346933c14e58e42369d13a04abd
Parents: 7e8294d
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Apr 27 14:16:06 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Apr 27 14:16:06 2016 -0700
----------------------------------------------------------------------
.../gemfire/codeAnalysis/sanctionedSerializables.txt | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c235ef84/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index f7ce62b..03746c1 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -128,18 +128,6 @@ com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException,true,1
com/gemstone/gemfire/cache/execute/FunctionAdapter,false
com/gemstone/gemfire/cache/execute/FunctionException,true,4893171227542647452
com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException,true,1,id:com/gemstone/gemfire/distributed/DistributedMember
-com/gemstone/gemfire/cache/hdfs/HDFSIOException,false
-com/gemstone/gemfire/cache/hdfs/StoreExistsException,true,1
-com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreConfigHolder,false,autoMajorCompact:boolean,batchIntervalMillis:int,batchSize:int,blockCacheSize:float,clientConfigFile:java/lang/String,diskStoreName:java/lang/String,diskSynchronous:boolean,dispatcherThreads:int,fileRolloverInterval:int,homeDir:java/lang/String,isAutoCompact:boolean,isPersistenceEnabled:boolean,logPrefix:java/lang/String,majorCompactionConcurrency:int,majorCompactionIntervalMins:int,maxConcurrency:int,maxFileSize:int,maxInputFileCount:int,maxInputFileSizeMB:int,maximumQueueMemory:int,minInputFileCount:int,name:java/lang/String,namenodeURL:java/lang/String,oldFileCleanupIntervalMins:int
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSCompactionManager$CompactionIsDisabled,true,1
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSFlushQueueFunction,false
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSForceCompactionFunction,false
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSLastCompactionTimeFunction,false
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/HdfsSortedOplogOrganizer$HoplogReadersController$1,true,1,this$1:com/gemstone/gemfire/cache/hdfs/internal/hoplog/HdfsSortedOplogOrganizer$HoplogReadersController,val$this$0:com/gemstone/gemfire/cache/hdfs/internal/hoplog/HdfsSortedOplogOrganizer
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/HdfsSortedOplogOrganizer$HoplogReadersController$2,true,1,this$1:com/gemstone/gemfire/cache/hdfs/internal/hoplog/HdfsSortedOplogOrganizer$HoplogReadersController,val$this$0:com/gemstone/gemfire/cache/hdfs/internal/hoplog/HdfsSortedOplogOrganizer
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/Hoplog$HoplogVersion,false
-com/gemstone/gemfire/cache/hdfs/internal/hoplog/Hoplog$Meta,false
-com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile$CompressionType,false
com/gemstone/gemfire/cache/operations/OperationContext$OperationCode,false
com/gemstone/gemfire/cache/operations/OperationContext$Resource,false
com/gemstone/gemfire/cache/partition/PartitionNotAvailableException,true,1