lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject [2/2] lucene-solr:master: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Date Sun, 01 May 2016 10:10:19 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7bc4859d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7bc4859d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7bc4859d

Branch: refs/heads/master
Commit: 7bc4859daffa30a467b41e70a17d952e89ac4814
Parents: 516fb5d 3b9aa4d
Author: Karl Wright <DaddyWri@gmail.com>
Authored: Sun May 1 06:09:51 2016 -0400
Committer: Karl Wright <DaddyWri@gmail.com>
Committed: Sun May 1 06:09:51 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/lucene/store/NativeFSLockFactory.java    | 4 ++--
 .../java/org/apache/lucene/store/SimpleFSLockFactory.java    | 4 ++--
 solr/CHANGES.txt                                             | 2 ++
 solr/server/scripts/cloud-scripts/zkcli.bat                  | 8 +++++++-
 solr/server/scripts/cloud-scripts/zkcli.sh                   | 8 +++++++-
 5 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



Mime
View raw message