Merge branch 'develop' of github.com:kakao/s2graph into develop * 'develop' of github.com:kakao/s2graph: fix scala version to 2.10.6 for s2counter_loader add config 's2graph.read-only.url' for counter
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/d7b48a69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/d7b48a69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/d7b48a69 Branch: refs/heads/feature/test_daewon Commit: d7b48a69a8140b8085756d2441642e3ee6ed2a22 Parents: c6b607f e8befb6 Author: daewon <[email protected]> Authored: Wed Dec 23 14:46:45 2015 +0900 Committer: daewon <[email protected]> Committed: Wed Dec 23 14:46:45 2015 +0900 ---------------------------------------------------------------------- .../main/scala/s2/config/S2CounterConfig.scala | 5 ++-- .../s2/counter/core/v2/ExactStorageGraph.scala | 25 +++----------------- .../counter/core/v2/RankingStorageGraph.scala | 5 ++-- s2counter_loader/build.sbt | 2 +- .../main/scala/s2/config/StreamingConfig.scala | 1 + .../src/test/resources/application.conf | 1 + 6 files changed, 12 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
