You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/05/04 16:17:10 UTC
[19/50] lucene-solr:jira/solr-8593: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
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/jira/solr-8593
Commit: 7bc4859daffa30a467b41e70a17d952e89ac4814
Parents: 516fb5d 3b9aa4d
Author: Karl Wright <Da...@gmail.com>
Authored: Sun May 1 06:09:51 2016 -0400
Committer: Karl Wright <Da...@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(-)
----------------------------------------------------------------------