You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2016/03/30 12:54:35 UTC
[1/2] lucene-solr:branch_5_5: LUCENE-6938: addVersion can no longer
do a --reord-only merge with git (cherry picked from commit 2514521)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 ad8ca8154 -> 7105d4517
LUCENE-6938: addVersion can no longer do a --reord-only merge with git
(cherry picked from commit 2514521)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7105d451
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7105d451
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7105d451
Branch: refs/heads/branch_5_5
Commit: 7105d451777c2c30e7f2b48260265b352fbb3472
Parents: feecf54
Author: Mike McCandless <mi...@apache.org>
Authored: Thu Feb 11 10:19:15 2016 +0100
Committer: Jan Høydahl <ja...@apache.org>
Committed: Wed Mar 30 12:51:35 2016 +0200
----------------------------------------------------------------------
dev-tools/scripts/addVersion.py | 10 +---------
dev-tools/scripts/scriptutil.py | 5 -----
2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7105d451/dev-tools/scripts/addVersion.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index 0da761e..6eaf517 100644
--- a/dev-tools/scripts/addVersion.py
+++ b/dev-tools/scripts/addVersion.py
@@ -168,8 +168,7 @@ def check_solr_version_tests():
def read_config():
parser = argparse.ArgumentParser(description='Add a new version')
parser.add_argument('version', type=Version.parse)
- parser.add_argument('-c', '--changeid', type=int, help='SVN ChangeId for downstream version change to merge')
- parser.add_argument('-r', '--downstream-repo', help='Path to downstream checkout for given changeid')
+ parser.add_argument('-c', '--changeid', type=str, help='SVN ChangeId for downstream version change to merge')
c = parser.parse_args()
c.branch_type = find_branch_type()
@@ -177,10 +176,6 @@ def read_config():
c.version.is_minor_release() and c.branch_type == 'stable' or \
c.branch_type == 'major'
- if bool(c.changeid) != bool(c.downstream_repo):
- parser.error('--changeid and --upstream-repo must be used together')
- if not c.changeid and not c.matching_branch:
- parser.error('Must use --changeid for forward porting bugfix release version to other branches')
if c.changeid and c.matching_branch:
parser.error('Cannot use --changeid on branch that new version will originate on')
if c.changeid and c.version.is_major_release():
@@ -191,9 +186,6 @@ def read_config():
def main():
c = read_config()
- if c.changeid:
- merge_change(c.changeid, c.downstream_repo)
-
print('\nAdding new version %s' % c.version)
update_changes('lucene/CHANGES.txt', c.version)
update_changes('solr/CHANGES.txt', c.version)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7105d451/dev-tools/scripts/scriptutil.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/scriptutil.py b/dev-tools/scripts/scriptutil.py
index 71ade7a..6a3bcab 100644
--- a/dev-tools/scripts/scriptutil.py
+++ b/dev-tools/scripts/scriptutil.py
@@ -117,11 +117,6 @@ version_prop_re = re.compile('version\.base=(.*)')
def find_current_version():
return version_prop_re.search(open('lucene/version.properties').read()).group(1)
-def merge_change(changeid, repo):
- print('\nMerging downstream change %d...' % changeid, end='')
- run('svn merge -c %d --record-only %s' % (changeid, repo))
- print('done')
-
if __name__ == '__main__':
print('This is only a support module, it cannot be run')
sys.exit(1)
[2/2] lucene-solr:branch_5_5: SOLR-8870: AngularJS support for qt
style handlers,
and fix slash encoding bug to support Query panel through proxy (cherry picked
from commit aec11eb)
Posted by ja...@apache.org.
SOLR-8870: AngularJS support for qt style handlers, and fix slash encoding bug to support Query panel through proxy
(cherry picked from commit aec11eb)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/feecf54d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/feecf54d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/feecf54d
Branch: refs/heads/branch_5_5
Commit: feecf54d91453a2d6ff5734c22079c0c61869983
Parents: ad8ca81
Author: Jan Høydahl <ja...@apache.org>
Authored: Tue Mar 29 00:31:40 2016 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Wed Mar 30 12:51:35 2016 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/webapp/web/js/angular/controllers/query.js | 9 +++++++--
solr/webapp/web/js/angular/services.js | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/feecf54d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3c2f4ad..9eb6c9c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -34,6 +34,9 @@ Bug Fixes
* SOLR-8838: Returning non-stored docValues is incorrect for negative floats and doubles.
(Ishan Chattopadhyaya, Steve Rowe)
+* SOLR-8870: AngularJS Query tab no longer URL-encodes the /select part of the request, fixing possible 404 issue
+ when Solr is behind a proxy. Also, now supports old-style &qt param when handler not prefixed with "/" (janhoy)
+
======================= 5.5.0 =======================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/feecf54d/solr/webapp/web/js/angular/controllers/query.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/query.js b/solr/webapp/web/js/angular/controllers/query.js
index 3f0fb27..8e89778 100644
--- a/solr/webapp/web/js/angular/controllers/query.js
+++ b/solr/webapp/web/js/angular/controllers/query.js
@@ -67,14 +67,19 @@ solrAdminApp.controller('QueryController',
}
}
- var qt = $scope.qt ? $scope.qt : "select";
+ var qt = $scope.qt ? $scope.qt : "/select";
for (var filter in $scope.filters) {
copy(params, $scope.filters[filter]);
}
params.core = $routeParams.core;
- params.handler = qt;
+ if (qt[0] == '/') {
+ params.handler = qt.substring(1);
+ } else { // Support legacy style handleSelect=true configs
+ params.handler = "select";
+ set("qt", qt);
+ }
var url = Query.url(params);
Query.query(params, function(data) {
$scope.lang = $scope.query.wt;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/feecf54d/solr/webapp/web/js/angular/services.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/services.js b/solr/webapp/web/js/angular/services.js
index 13d01f7..014d36b 100644
--- a/solr/webapp/web/js/angular/services.js
+++ b/solr/webapp/web/js/angular/services.js
@@ -212,7 +212,7 @@ solrAdminServices.factory('System',
}])
.factory('Query',
['$resource', function($resource) {
- var resource = $resource('/solr/:core:handler', {core: '@core', handler: '@handler', '_':Date.now()}, {
+ var resource = $resource('/solr/:core/:handler', {core: '@core', handler: '@handler', '_':Date.now()}, {
"query": {
method: "GET",
transformResponse: function (data) {
@@ -230,7 +230,7 @@ solrAdminServices.factory('System',
}
}
}
- return "/solr/" + params.core + params.handler + "?" + qs.sort().join("&");
+ return "/solr/" + params.core + "/" + params.handler + "?" + qs.sort().join("&");
}
return resource;
}])