You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by da...@apache.org on 2016/01/04 07:41:13 UTC
[40/46] incubator-s2graph git commit: Merge branch
'feature/move_test_from_rest_to_core' into develop
Merge branch 'feature/move_test_from_rest_to_core' into develop
* feature/move_test_from_rest_to_core:
Make logger works
Move VertexSpec to s2core, remove unused dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/d9f6ee85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/d9f6ee85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/d9f6ee85
Branch: refs/heads/feature/test_daewon
Commit: d9f6ee8549abf417799a0df43188cb95ebf7442b
Parents: 8f86bc3 5a77433
Author: daewon <bl...@gmail.com>
Authored: Wed Dec 30 11:55:36 2015 +0900
Committer: daewon <bl...@gmail.com>
Committed: Wed Dec 30 11:55:36 2015 +0900
----------------------------------------------------------------------
build.sbt | 8 +-
s2core/src/main/resources/logback.xml | 33 +-
s2core/src/main/resources/reference.conf | 19 +-
.../core/storage/hbase/AsynchbaseStorage.scala | 10 +-
.../com/kakao/s2graph/core/utils/Logger.scala | 1 -
.../kakao/s2graph/core/Integrate/CrudTest.scala | 1 -
.../core/Integrate/IntegrateCommon.scala | 2 +-
.../core/Integrate/VertexTestHelper.scala | 71 ++
.../hbase/AsynchbaseQueryBuilderTest.scala | 3 +-
s2rest_play/build.sbt | 3 +-
.../test/benchmark/JsonBenchmarkSpec.scala | 14 +-
.../benchmark/OrderingUtilBenchmarkSpec.scala | 16 +-
.../benchmark/PostProcessBenchmarkSpec.scala | 367 +++++-----
.../test/benchmark/SamplingBenchmarkSpec.scala | 2 +-
.../test/controllers/AdminControllerSpec.scala | 30 +-
s2rest_play/test/controllers/SpecCommon.scala | 668 +++++++++----------
s2rest_play/test/controllers/VertexSpec.scala | 106 +--
17 files changed, 718 insertions(+), 636 deletions(-)
----------------------------------------------------------------------