Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 B147ADB9E for ; Fri, 17 May 2013 23:30:07 +0000 (UTC) Received: (qmail 22027 invoked by uid 500); 17 May 2013 23:30:08 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 21986 invoked by uid 500); 17 May 2013 23:30:08 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 21978 invoked by uid 99); 17 May 2013 23:30:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 23:30:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 23:30:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C42AE23889E2; Fri, 17 May 2013 23:29:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1484027 - /accumulo/branches/1.5/.gitignore Date: Fri, 17 May 2013 23:29:43 -0000 To: commits@accumulo.apache.org From: ctubbsii@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130517232943.C42AE23889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctubbsii Date: Fri May 17 23:29:43 2013 New Revision: 1484027 URL: http://svn.apache.org/r1484027 Log: ACCUMULO-1431 clean up some redundant .gitignore entries Modified: accumulo/branches/1.5/.gitignore Modified: accumulo/branches/1.5/.gitignore URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/.gitignore?rev=1484027&r1=1484026&r2=1484027&view=diff ============================================================================== --- accumulo/branches/1.5/.gitignore (original) +++ accumulo/branches/1.5/.gitignore Fri May 17 23:29:43 2013 @@ -13,14 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -# / +# global Eclipse, Maven, Python +target/ +.project +.classpath +.settings +.pydevproject *.pyc + +# JetBrains IDE +.idea +*.iml + +# / /logs /walogs -/target -/.project -/.settings -/.pydevproject # /conf/ /conf/accumulo-metrics.xml @@ -34,31 +41,12 @@ /conf/accumulo-site.xml /conf/accumulo_user_manual.pdf -# /contrib/accumulo_sample/ -/contrib/accumulo_sample/.settings -/contrib/accumulo_sample/.project -/contrib/accumulo_sample/target - # /contrib/accumulo_sample/ingest/ -/contrib/accumulo_sample/ingest/target -/contrib/accumulo_sample/ingest/.settings -/contrib/accumulo_sample/ingest/.classpath -/contrib/accumulo_sample/ingest/.project /contrib/accumulo_sample/ingest/lib # /contrib/accumulo_sample/query/ -/contrib/accumulo_sample/query/target -/contrib/accumulo_sample/query/.settings -/contrib/accumulo_sample/query/.classpath -/contrib/accumulo_sample/query/.project /contrib/accumulo_sample/query/lib -# /contrib/accumulo_sample/query-war/ -/contrib/accumulo_sample/query-war/target -/contrib/accumulo_sample/query-war/.settings -/contrib/accumulo_sample/query-war/.classpath -/contrib/accumulo_sample/query-war/.project - # /docs/ /docs/config.html /docs/accumulo_user_manual.pdf @@ -71,55 +59,6 @@ /lib/native /lib/*.jar -# /assemble/ -/assemble/target -/assemble/.settings -/assemble/.project - -# /core/ -/core/target -/core/.settings -/core/.project -/core/.classpath - -# /examples/ -/examples/lib -/examples/target -/examples/.settings -/examples/.classpath -/examples/.project - -# /examples/instamo/ -/examples/instamo/target -/examples/instamo/.classpath -/examples/instamo/.project -/examples/instamo/.settings/ - - -# /examples/simple/ -/examples/simple/target -/examples/simple/.classpath -/examples/simple/.project -/examples/simple/.settings/ - -# /fate/ -/fate/target -/fate/.settings -/fate/.classpath -/fate/.project - -# /proxy/ -/proxy/target -/proxy/.settings -/proxy/.classpath -/proxy/.project - -# /server/ -/server/target -/server/.project -/server/.settings -/server/.classpath - # /server/src/main/c++/mlock/ /server/src/main/c++/mlock/*.jnilib /server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h @@ -127,39 +66,11 @@ # /server/src/main/c++/nativeMap/ /server/src/main/c++/nativeMap/*.jnilib -# /start/ -/start/target -/start/.classpath -/start/.project -/start/.settings - -# /trace/ -/trace/target -/trace/.classpath -/trace/.project -/trace/.settings - -# /test/ -/test/target -/test/.classpath -/test/.project -/test/.settings - # /test/system/auto/ -/test/system/auto/*.pyc /test/system/auto/fake_disk_failure.so -# /test/system/auto/simple/ -/test/system/auto/simple/*.pyc - -# /test/system/auto/stress/ -/test/system/auto/stress/*.pyc - # /test/system/continuous/ /test/system/continuous/continuous-env.sh /test/system/continuous/walkers.txt /test/system/continuous/ingesters.txt -# JetBrains IDE -.idea -*.iml