You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/06/07 14:11:41 UTC
[37/50] [abbrv] lucene-solr:feature/autoscaling: SOLR-10713: Add
common output files to .gitignore
SOLR-10713: Add common output files to .gitignore
Signed-off-by: Mike Drob <md...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/99093cae
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/99093cae
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/99093cae
Branch: refs/heads/feature/autoscaling
Commit: 99093caec5932b00decbc2ee5948610bfd9202ca
Parents: 6b022c9
Author: Jason Gerlowski <ge...@gmail.com>
Authored: Sun Jun 4 16:59:25 2017 -0400
Committer: Mike Drob <md...@apache.org>
Committed: Mon Jun 5 12:49:50 2017 -0500
----------------------------------------------------------------------
.gitignore | 41 +++++++----------------------------------
solr/.gitignore | 30 ++++++++++++++++++++++++++++++
solr/CHANGES.txt | 2 ++
3 files changed, 39 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/99093cae/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4962ab9..7137e12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,19 @@
# .
/eclipse-build
/classes
-**/build
+build
/idea-build
-**/dist
-**/lib
-**/test-lib
+dist
+lib
+test-lib
/*~
/velocity.log
/build.properties
/.idea
lucene/**/*.iml
-solr/**/*.iml
parent.iml
-**/*.ipr
-**/*.iws
+*.ipr
+*.iws
/.project
/.classpath
/.settings
@@ -22,33 +21,7 @@ parent.iml
/prj.el
/bin
/bin.*
-**/pom.xml
+pom.xml
/nbproject
/nb-build
.pydevproject
-
-/solr/package
-
-# can this be minimized?
-/solr/example/start.jar
-/solr/example/webapps/*
-/solr/example/logs/*.log
-/solr/example/**/data
-/solr/example/solr/lib
-/solr/example/solr/logs
-/solr/example/solr/zoo_data
-/solr/example/work/*
-/solr/example/exampledocs/post.jar
-
-/solr/example/example-DIH/**/data
-/solr/example/example-DIH/**/dataimport.properties
-/solr/example/example-DIH/solr/mail/lib/*.jar
-
-solr/contrib/dataimporthandler/test-lib/
-
-solr/core/test-lib/
-
-solr/server/logs/
-solr/server/solr/zoo_data/
-solr/server/solr-webapp
-solr/server/start.jar
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/99093cae/solr/.gitignore
----------------------------------------------------------------------
diff --git a/solr/.gitignore b/solr/.gitignore
new file mode 100644
index 0000000..d02918b
--- /dev/null
+++ b/solr/.gitignore
@@ -0,0 +1,30 @@
+*.iml
+
+/bin/*.pid
+
+/contrib/dataimporthandler/test-lib/
+
+/core/test-lib/
+
+/example/start.jar
+/example/webapps/*
+/example/logs/*.log
+/example/**/data
+/example/solr/lib
+/example/solr/logs
+/example/solr/zoo_data
+/example/work/*
+/example/exampledocs/post.jar
+/example/example-DIH/**/data
+/example/example-DIH/**/dataimport.properties
+/example/example-DIH/solr/mail/lib/*.jar
+
+/package
+
+/server/logs/
+/server/solr/zoo_data/
+/server/solr-webapp
+/server/start.jar
+
+*.out
+*.err
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/99093cae/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7b3dcff..a11c470 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -236,6 +236,8 @@ Other Changes
* SOLR-10671: Add abstract doInit method to the SolrMetricReporter base class.
(Christine Poerschke, Anshum Gupta)
+* SOLR-10713: Ignore .pid and .out files in solr working directory (Jason Gerlowski via Mike Drob)
+
================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.