Repository: tajo Updated Branches: refs/heads/master d8b99cc98 -> bf04b56c5
TAJO-1827: JSON parsing error at storage-site.json while tajo master starts up. Closes #776 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/bf04b56c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/bf04b56c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/bf04b56c Branch: refs/heads/master Commit: bf04b56c52a53d6465d0eff97eef3dcf9b0187e3 Parents: d8b99cc Author: JaeHwa Jung <[email protected]> Authored: Fri Sep 25 01:59:45 2015 +0900 Committer: JaeHwa Jung <[email protected]> Committed: Fri Sep 25 01:59:45 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 ++ tajo-dist/pom.xml | 1 + .../src/main/conf/storage-site.json.template | 35 -------------------- 3 files changed, 4 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/bf04b56c/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 7cb75a4..ffcad96 100644 --- a/CHANGES +++ b/CHANGES @@ -296,6 +296,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1827: JSON parsing error at storage-site.json while tajo master + starts up. (jaehwa) + TAJO-1884: Add missing jetty-util dependency. (jinho) TAJO-1861: TSQL should change line after printout error message during http://git-wip-us.apache.org/repos/asf/tajo/blob/bf04b56c/tajo-dist/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-dist/pom.xml b/tajo-dist/pom.xml index b0e9f64..121622d 100644 --- a/tajo-dist/pom.xml +++ b/tajo-dist/pom.xml @@ -46,6 +46,7 @@ <configuration> <excludes> <exclude>src/main/conf/workers</exclude> + <exclude>src/main/conf/storage-site.json.template</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/tajo/blob/bf04b56c/tajo-dist/src/main/conf/storage-site.json.template ---------------------------------------------------------------------- diff --git a/tajo-dist/src/main/conf/storage-site.json.template b/tajo-dist/src/main/conf/storage-site.json.template index 2d7b19d..e69de29 100644 --- a/tajo-dist/src/main/conf/storage-site.json.template +++ b/tajo-dist/src/main/conf/storage-site.json.template @@ -1,35 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* HBase Storage Plugin and Tablespace Example */ -/* -{ - "spaces": { - "hbase-cluster1": { - "uri": "hbase://quorum1:port,quorum2:port/" - } - }, - - "storages": { - "hbase": { - "handler": "org.apache.tajo.storage.hbase.HBaseTablespace", - "default-format": "hbase" - } - } -} -*/ \ No newline at end of file
