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 2017/11/12 14:15:16 UTC
[1/2] incubator-s2graph git commit: Update AdminController.scala
Repository: incubator-s2graph
Updated Branches:
refs/heads/master 128d67c06 -> 79e1ffa68
Update AdminController.scala
S2GRAPH-168 - Fix args order mismatch when use addServiceColumnProp
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/5febb192
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/5febb192
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/5febb192
Branch: refs/heads/master
Commit: 5febb192e3e1235291f69ecb84ee8998bf45bd2b
Parents: 3361320
Author: zhangmengzju <zh...@163.com>
Authored: Thu Oct 26 20:51:33 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Oct 26 20:51:33 2017 +0800
----------------------------------------------------------------------
.../org/apache/s2graph/rest/play/controllers/AdminController.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5febb192/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
----------------------------------------------------------------------
diff --git a/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala b/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
index 8eb25fd..2d3530b 100644
--- a/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
+++ b/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
@@ -317,7 +317,7 @@ object AdminController extends Controller {
serviceColumn <- ServiceColumn.find(service.id.get, columnName)
prop <- requestParser.toPropElements(js).toOption
} yield {
- ColumnMeta.findOrInsert(serviceColumn.id.get, prop.name, prop.defaultValue)
+ ColumnMeta.findOrInsert(serviceColumn.id.get, prop.name, prop.datatType)
}
}
[2/2] incubator-s2graph git commit: [S2GRAPH-168]:Fix args order
mismatch when use addServiceColumnProp
Posted by st...@apache.org.
[S2GRAPH-168]:Fix args order mismatch when use addServiceColumnProp
JIRA:
[S2GRAPH-168] https://issues.apache.org/jira/browse/S2GRAPH-168
Pull Request:
Closes #125
Author
zhangmengzju <zh...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/79e1ffa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/79e1ffa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/79e1ffa6
Branch: refs/heads/master
Commit: 79e1ffa68244d1655e283b6d57f40983981a0773
Parents: 128d67c 5febb19
Author: DO YUNG YOON <st...@apache.org>
Authored: Sun Nov 12 23:16:57 2017 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Sun Nov 12 23:17:44 2017 +0900
----------------------------------------------------------------------
CHANGES | 1 +
.../org/apache/s2graph/rest/play/controllers/AdminController.scala | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/79e1ffa6/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 6e685ae,7f37f00..5f61edf
--- a/CHANGES
+++ b/CHANGES
@@@ -36,6 -36,6 +36,7 @@@ Release Notes - S2Graph - Version 0.2.
** Bug
* [S2GRAPH-159] - Wrong syntax at a bash script under Linux
++ * [S2GRAPH-168] - Fix args order mismatch when use addServiceColumnProp
** Improvement
* [S2GRAPH-72] - Support Apache TinkerPop and Gremlin