You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2016/11/14 17:49:58 UTC
[07/12] incubator-s2graph git commit: Merge branch 'master' into
S2GRAPH-125
Merge branch 'master' into S2GRAPH-125
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/c90fb0d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/c90fb0d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/c90fb0d6
Branch: refs/heads/master
Commit: c90fb0d602530972c0c12c456cb27200fcd8841e
Parents: 5d392f5 d37888f
Author: DO YUNG YOON <st...@apache.org>
Authored: Thu Nov 10 20:51:02 2016 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Thu Nov 10 20:51:02 2016 +0900
----------------------------------------------------------------------
CHANGES | 2 +
.../apache/s2graph/core/ExceptionHandler.scala | 161 ++++++-------------
.../apache/s2graph/core/storage/Storage.scala | 16 +-
.../core/storage/hbase/AsynchbaseStorage.scala | 1 +
.../apache/s2graph/rest/play/Bootstrap.scala | 35 ++--
.../s2graph/rest/play/actors/QueueActor.scala | 10 +-
.../controllers/ApplicationController.scala | 9 ++
.../play/controllers/CounterController.scala | 3 +-
.../rest/play/controllers/EdgeController.scala | 21 +--
.../play/controllers/PublishController.scala | 3 +-
.../play/controllers/VertexController.scala | 7 +-
11 files changed, 110 insertions(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/c90fb0d6/s2core/src/main/scala/org/apache/s2graph/core/storage/Storage.scala
----------------------------------------------------------------------