Merge remote-tracking branch 'origin/develop' into feature/handler_json_parsing_error
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/e8c35881 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/e8c35881 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/e8c35881 Branch: refs/heads/feature/test_daewon Commit: e8c358810ae2658d19228086a0f528c4f9397f09 Parents: e607fc9 e8befb6 Author: Jaesang Kim <[email protected]> Authored: Wed Dec 23 11:59:07 2015 +0900 Committer: Jaesang Kim <[email protected]> Committed: Wed Dec 23 11:59:07 2015 +0900 ---------------------------------------------------------------------- .../main/scala/s2/config/S2CounterConfig.scala | 5 ++-- .../s2/counter/core/v2/ExactStorageGraph.scala | 25 +++----------------- .../counter/core/v2/RankingStorageGraph.scala | 6 ++--- s2counter_loader/build.sbt | 2 +- .../main/scala/s2/config/StreamingConfig.scala | 1 + .../src/test/resources/application.conf | 1 + 6 files changed, 12 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/e8c35881/s2counter_core/src/main/scala/s2/counter/core/v2/RankingStorageGraph.scala ----------------------------------------------------------------------
