Skip to content
This repository has been archived by the owner on Jun 22, 2020. It is now read-only.

Resolving #196 #197

Merged
merged 4 commits into from
Dec 14, 2015
Merged

Resolving #196 #197

merged 4 commits into from
Dec 14, 2015

Conversation

hsleep
Copy link
Contributor

@hsleep hsleep commented Dec 6, 2015

Resolving #196

commit 547820cb7ee4791c1da48e7028c63529d2d79aa4
Author: Jaesang Kim honeysleep@gmail.com
Date: Sun Dec 6 23:27:51 2015 +0900

delete unused file

commit aabdcfdb390e73bb8f19d95037cbba3dad2ff932
Author: Jaesang Kim honeysleep@gmail.com
Date: Sun Dec 6 01:24:06 2015 +0900

update README

commit 7913f62ad6f4f0031e2ae4d1ebaf22c25577d80e
Merge: 5eb4838 1bb3b6d
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Dec 4 23:53:09 2015 +0900

Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit 5eb4838
Author: Jaesang Kim honeysleep@gmail.com
Date: Thu Nov 19 14:47:19 2015 +0900

change graph version

commit e17cf17
Author: Jaesang Kim honeysleep@gmail.com
Date: Thu Nov 19 00:31:07 2015 +0900

update README.md

commit b536a1c
Author: Jaesang Kim honeysleep@gmail.com
Date: Thu Nov 19 00:30:33 2015 +0900

update README.md

commit b1e6d45
Author: Jaesang Kim honeysleep@gmail.com
Date: Thu Nov 19 00:12:49 2015 +0900

update README.md

commit f1e0a7f
Author: Jaesang Kim honeysleep@gmail.com
Date: Thu Nov 19 00:12:06 2015 +0900

update README.md

commit 0f541dd
Author: Jaesang Kim honeysleep@gmail.com
Date: Wed Nov 18 23:56:00 2015 +0900

update README.md

commit 52f75c5
Merge: e3f6970 9da14f3
Author: Jaesang Kim honeysleep@gmail.com
Date: Wed Nov 18 22:39:58 2015 +0900

Merge branch 'feature/dev_support' of github.com:kakao/s2graph into feature/dev_support

commit e3f6970
Merge: 763635c 8366ebc
Author: Jaesang Kim honeysleep@gmail.com
Date: Wed Nov 18 22:37:03 2015 +0900

Merge branch 'develop' into feature/dev_support

commit 9da14f3
Author: Jaesang Kim honeysleep@gmail.com
Date: Wed Nov 18 11:26:11 2015 +0900

update README.md

commit b93dca5
Merge: 763635c d2bd5fc
Author: Jaesang Kim honeysleep@gmail.com
Date: Wed Nov 18 11:15:22 2015 +0900

Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit 763635c
Merge: dc8e0cc 3c1be8e
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 18:58:24 2015 +0900

Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit dc8e0cc
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 18:11:09 2015 +0900

add docker-compose

commit 8f7f9e5
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 13:42:21 2015 +0900

change run script

commit 7d50208
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 11:46:20 2015 +0900

change schema.sql

commit 8aed82a
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 11:04:23 2015 +0900

add conf/application.conf

commit 09c32c4
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 10:47:45 2015 +0900

add dockerExposedPorts

commit 073381c
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 10:43:31 2015 +0900

docker for s2graph

commit 5c66392
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 02:35:21 2015 +0900

support docker

commit 3c6a4de
Merge: bb04c0a 32ca022
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Nov 13 01:58:18 2015 +0900

Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit bb04c0a
Merge: 9210ca4 f0e52a6
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Oct 30 19:24:26 2015 +0900

Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit 9210ca4
Merge: c26645e 2786b18
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Oct 30 16:50:37 2015 +0900

Merge branch 'feature/issue#155' into feature/dev_support

commit c26645e
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Oct 30 16:50:31 2015 +0900

add schema.sql

commit fdba07b
Merge: fbabc34 c7a8aff
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Oct 30 15:42:46 2015 +0900

Merge branch 'feature/issue#155' into develop

commit fbabc34
Author: Jaesang Kim honeysleep@gmail.com
Date: Fri Oct 30 15:34:46 2015 +0900

script for dev-support using docker

commit 547820cb7ee4791c1da48e7028c63529d2d79aa4
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Sun Dec 6 23:27:51 2015 +0900

    delete unused file

commit aabdcfdb390e73bb8f19d95037cbba3dad2ff932
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Sun Dec 6 01:24:06 2015 +0900

    update README

commit 7913f62ad6f4f0031e2ae4d1ebaf22c25577d80e
Merge: 5eb4838 1bb3b6d
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Dec 4 23:53:09 2015 +0900

    Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit 5eb4838
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Thu Nov 19 14:47:19 2015 +0900

    change graph version

commit e17cf17
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Thu Nov 19 00:31:07 2015 +0900

    update README.md

commit b536a1c
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Thu Nov 19 00:30:33 2015 +0900

    update README.md

commit b1e6d45
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Thu Nov 19 00:12:49 2015 +0900

    update README.md

commit f1e0a7f
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Thu Nov 19 00:12:06 2015 +0900

    update README.md

commit 0f541dd
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Wed Nov 18 23:56:00 2015 +0900

    update README.md

commit 52f75c5
Merge: e3f6970 9da14f3
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Wed Nov 18 22:39:58 2015 +0900

    Merge branch 'feature/dev_support' of github.com:kakao/s2graph into feature/dev_support

commit e3f6970
Merge: 763635c 8366ebc
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Wed Nov 18 22:37:03 2015 +0900

    Merge branch 'develop' into feature/dev_support

commit 9da14f3
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Wed Nov 18 11:26:11 2015 +0900

    update README.md

commit b93dca5
Merge: 763635c d2bd5fc
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Wed Nov 18 11:15:22 2015 +0900

    Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit 763635c
Merge: dc8e0cc 3c1be8e
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 18:58:24 2015 +0900

    Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit dc8e0cc
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 18:11:09 2015 +0900

    add docker-compose

commit 8f7f9e5
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 13:42:21 2015 +0900

    change run script

commit 7d50208
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 11:46:20 2015 +0900

    change schema.sql

commit 8aed82a
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 11:04:23 2015 +0900

    add conf/application.conf

commit 09c32c4
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 10:47:45 2015 +0900

    add dockerExposedPorts

commit 073381c
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 10:43:31 2015 +0900

    docker for s2graph

commit 5c66392
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 02:35:21 2015 +0900

    support docker

commit 3c6a4de
Merge: bb04c0a 32ca022
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Nov 13 01:58:18 2015 +0900

    Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit bb04c0a
Merge: 9210ca4 f0e52a6
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Oct 30 19:24:26 2015 +0900

    Merge remote-tracking branch 'origin/develop' into feature/dev_support

commit 9210ca4
Merge: c26645e 2786b18
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Oct 30 16:50:37 2015 +0900

    Merge branch 'feature/issue#155' into feature/dev_support

commit c26645e
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Oct 30 16:50:31 2015 +0900

    add schema.sql

commit fdba07b
Merge: fbabc34 c7a8aff
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Oct 30 15:42:46 2015 +0900

    Merge branch 'feature/issue#155' into develop

commit fbabc34
Author: Jaesang Kim <honeysleep@gmail.com>
Date:   Fri Oct 30 15:34:46 2015 +0900

    script for dev-support using docker
@hsleep
Copy link
Contributor Author

hsleep commented Dec 8, 2015

@elric-k please test and merge.

- Run s2graph as 'dev' mode

```
# sbt run -Dhost=default
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to set project to run.

sbt "project s2rest_play" run -Dhost=default

elric-k added a commit that referenced this pull request Dec 14, 2015
@elric-k elric-k merged commit cd52c91 into develop Dec 14, 2015
@elric-k
Copy link
Contributor

elric-k commented Dec 14, 2015

working good! 👍

@hsleep
Copy link
Contributor Author

hsleep commented Dec 14, 2015

thank you for fixing README.

2015년 12월 14일 (월) 오후 7:11, elric-kang notifications@github.com님이 작성:

working good! [image: 👍]


Reply to this email directly or view it on GitHub
#197 (comment).

@SteamShon SteamShon deleted the feature/Issue#196 branch December 23, 2015 03:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants