summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel DeLeo <dan@opscode.com>2011-10-31 11:54:12 -0700
committerDaniel DeLeo <dan@opscode.com>2011-10-31 11:54:12 -0700
commit97dd6be74ec54e5b696515781c186a815eb68e96 (patch)
tree33fff1d59cf7f0c23adc6c1112210afbafb99bcc
parent4db30baca78e07a89c1bee0f5034bfcc7a5c3a23 (diff)
parent5078cf78d1022b43b9f098d0bc06e03fbcaf044a (diff)
downloadchef-97dd6be74ec54e5b696515781c186a815eb68e96.tar.gz
Merge branch 'include-empty-solr-dirs'0.10.6.beta.1
-rw-r--r--chef-solr/solr/solr-jetty/logs/.git-dont-ignore0
-rw-r--r--chef-solr/solr/solr-jetty/work/.git-dont-ignore0
2 files changed, 0 insertions, 0 deletions
diff --git a/chef-solr/solr/solr-jetty/logs/.git-dont-ignore b/chef-solr/solr/solr-jetty/logs/.git-dont-ignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/chef-solr/solr/solr-jetty/logs/.git-dont-ignore
diff --git a/chef-solr/solr/solr-jetty/work/.git-dont-ignore b/chef-solr/solr/solr-jetty/work/.git-dont-ignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/chef-solr/solr/solr-jetty/work/.git-dont-ignore