Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-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 D000517CB1 for ; Thu, 16 Apr 2015 00:09:47 +0000 (UTC) Received: (qmail 38961 invoked by uid 500); 16 Apr 2015 00:09:47 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 38922 invoked by uid 500); 16 Apr 2015 00:09:47 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 38913 invoked by uid 99); 16 Apr 2015 00:09:47 -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, 16 Apr 2015 00:09:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9135AE050B; Thu, 16 Apr 2015 00:09:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ndimiduk@apache.org To: commits@phoenix.apache.org Message-Id: <062edaf3449c4168b6937587599d80d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: phoenix git commit: PHOENIX-1865 Fix missing ASL headers Date: Thu, 16 Apr 2015 00:09:47 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 74dd80b5c -> a4e9b4b90 PHOENIX-1865 Fix missing ASL headers Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a4e9b4b9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a4e9b4b9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a4e9b4b9 Branch: refs/heads/4.x-HBase-0.98 Commit: a4e9b4b9037bd4fa4bb19d237468fd942e21469f Parents: 74dd80b Author: Nick Dimiduk Authored: Tue Apr 14 16:28:26 2015 -0700 Committer: Nick Dimiduk Committed: Wed Apr 15 17:04:44 2015 -0700 ---------------------------------------------------------------------- .../test/resources/datamodel/test_schema.sql | 16 ++++++++++++++ phoenix-protocol/src/main/PGuidePosts.proto | 20 ++++++++++++++++++ phoenix-spark/pom.xml | 22 ++++++++++++++++++++ phoenix-spark/src/it/resources/log4j.xml | 21 +++++++++++++++++++ phoenix-spark/src/it/resources/setup.sql | 16 ++++++++++++++ pom.xml | 2 ++ 6 files changed, 97 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4e9b4b9/phoenix-pherf/src/test/resources/datamodel/test_schema.sql ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema.sql b/phoenix-pherf/src/test/resources/datamodel/test_schema.sql index 498f832..8f16675 100644 --- a/phoenix-pherf/src/test/resources/datamodel/test_schema.sql +++ b/phoenix-pherf/src/test/resources/datamodel/test_schema.sql @@ -1,3 +1,19 @@ +-- 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. + CREATE TABLE IF NOT EXISTS PHERF.TEST_TABLE ( TENANT_ID CHAR(15) NOT NULL, PARENT_ID CHAR(15) NOT NULL, http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4e9b4b9/phoenix-protocol/src/main/PGuidePosts.proto ---------------------------------------------------------------------- diff --git a/phoenix-protocol/src/main/PGuidePosts.proto b/phoenix-protocol/src/main/PGuidePosts.proto index 1550391..047a658 100644 --- a/phoenix-protocol/src/main/PGuidePosts.proto +++ b/phoenix-protocol/src/main/PGuidePosts.proto @@ -1,3 +1,23 @@ +/* + * Copyright 2010 The Apache Software Foundation + * + * 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. + */ + option java_package = "org.apache.phoenix.coprocessor.generated"; option java_outer_classname = "PGuidePostsProtos"; option java_generic_services = true; http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4e9b4b9/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index fe99968..c84f0ba 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark/pom.xml @@ -1,3 +1,25 @@ + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4e9b4b9/phoenix-spark/src/it/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/src/it/resources/log4j.xml b/phoenix-spark/src/it/resources/log4j.xml index 58abece..10c2dc0 100644 --- a/phoenix-spark/src/it/resources/log4j.xml +++ b/phoenix-spark/src/it/resources/log4j.xml @@ -1,4 +1,25 @@ + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4e9b4b9/phoenix-spark/src/it/resources/setup.sql ---------------------------------------------------------------------- diff --git a/phoenix-spark/src/it/resources/setup.sql b/phoenix-spark/src/it/resources/setup.sql index 14a7e7e..ce74c58 100644 --- a/phoenix-spark/src/it/resources/setup.sql +++ b/phoenix-spark/src/it/resources/setup.sql @@ -1,3 +1,19 @@ +-- 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. + CREATE TABLE table1 (id BIGINT NOT NULL PRIMARY KEY, col1 VARCHAR) CREATE TABLE table2 (id BIGINT NOT NULL PRIMARY KEY, table1_id BIGINT, "t2col1" VARCHAR) UPSERT INTO table1 (id, col1) VALUES (1, 'test_row_1') http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4e9b4b9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3981466..3891215 100644 --- a/pom.xml +++ b/pom.xml @@ -194,6 +194,8 @@ **/*.properties **/*.proto **/*.versionsBackup + + **/*.properties docs/**