Merge branch 'master' into S2GRAPH-232 * master: [S2GRAPH-230] ResourceManager onEvict cause segmentation fault with AnnoyModelFetcher [S2GRAPH-231] Change the GraphQL type name to a valid string. reTest ci add background task on ResourceManager onEvict.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/46507cef Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/46507cef Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/46507cef Branch: refs/heads/master Commit: 46507cefc673e5671a1b750207567ce147da8e75 Parents: 014768a 07a5af3 Author: daewon <dae...@apache.org> Authored: Fri Jul 13 15:31:31 2018 +0900 Committer: daewon <dae...@apache.org> Committed: Fri Jul 13 15:31:31 2018 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../apache/s2graph/core/ResourceManager.scala | 28 +++++++++++++++----- .../scala/org/apache/s2graph/core/S2Graph.scala | 8 +++--- .../s2graph/core/utils/SafeUpdateCache.scala | 2 +- .../s2graph/graphql/types/ManagementType.scala | 1 + 5 files changed, 31 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/46507cef/s2graphql/src/main/scala/org/apache/s2graph/graphql/types/ManagementType.scala ----------------------------------------------------------------------
