Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AC23617D10 for ; Thu, 24 Sep 2015 17:00:35 +0000 (UTC) Received: (qmail 34076 invoked by uid 500); 24 Sep 2015 17:00:35 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 34038 invoked by uid 500); 24 Sep 2015 17:00:35 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 34029 invoked by uid 99); 24 Sep 2015 17:00:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2015 17:00:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 774FBE10BB; Thu, 24 Sep 2015 17:00:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blrunner@apache.org To: commits@tajo.apache.org Message-Id: <2acd33ac6f2243118b3c3512feda98af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tajo git commit: TAJO-1827: JSON parsing error at storage-site.json while tajo master starts up. Date: Thu, 24 Sep 2015 17:00:35 +0000 (UTC) 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 Authored: Fri Sep 25 01:59:45 2015 +0900 Committer: JaeHwa Jung 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 @@ src/main/conf/workers + src/main/conf/storage-site.json.template 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