From commits-return-884-apmail-sqoop-commits-archive=sqoop.apache.org@sqoop.apache.org Mon Apr 1 20:30:26 2013 Return-Path: X-Original-To: apmail-sqoop-commits-archive@www.apache.org Delivered-To: apmail-sqoop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5CB4F390 for ; Mon, 1 Apr 2013 20:30:26 +0000 (UTC) Received: (qmail 66929 invoked by uid 500); 1 Apr 2013 20:30:26 -0000 Delivered-To: apmail-sqoop-commits-archive@sqoop.apache.org Received: (qmail 66878 invoked by uid 500); 1 Apr 2013 20:30:26 -0000 Mailing-List: contact commits-help@sqoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sqoop.apache.org Delivered-To: mailing list commits@sqoop.apache.org Received: (qmail 66673 invoked by uid 99); 1 Apr 2013 20:30:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 20:30:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8EB5B835510; Mon, 1 Apr 2013 20:30:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jarcec@apache.org To: commits@sqoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: SQOOP-975: Sqoop2: Port conflict problems in tomcat Date: Mon, 1 Apr 2013 20:30:25 +0000 (UTC) Updated Branches: refs/heads/sqoop2 1a7731796 -> 78f689869 SQOOP-975: Sqoop2: Port conflict problems in tomcat (Vasanth kumar RJ via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/78f68986 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/78f68986 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/78f68986 Branch: refs/heads/sqoop2 Commit: 78f689869127a27b25cb7ea122b6bf513aabe293 Parents: 1a77317 Author: Jarek Jarcec Cecho Authored: Mon Apr 1 13:29:14 2013 -0700 Committer: Jarek Jarcec Cecho Committed: Mon Apr 1 13:29:14 2013 -0700 ---------------------------------------------------------------------- dist/src/main/server/conf/server.xml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/78f68986/dist/src/main/server/conf/server.xml ---------------------------------------------------------------------- diff --git a/dist/src/main/server/conf/server.xml b/dist/src/main/server/conf/server.xml index 3cd7cd9..3206cce 100644 --- a/dist/src/main/server/conf/server.xml +++ b/dist/src/main/server/conf/server.xml @@ -19,7 +19,7 @@ define subcomponents such as "Valves" at this level. Documentation at /docs/config/server.html --> - + @@ -87,7 +87,6 @@ --> -