lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject [2/3] lucene-solr:apiv2: Merge remote-tracking branch 'origin/apiv2' into apiv2
Date Sat, 26 Nov 2016 17:40:25 GMT
Merge remote-tracking branch 'origin/apiv2' into apiv2

Conflicts:
	solr/core/src/resources/apispec/core.config.Commands.json


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

Branch: refs/heads/apiv2
Commit: 6ec8a14fadc1104becb611508276989aa4fd7e34
Parents: a919579 4942f33
Author: Noble Paul <noble@apache.org>
Authored: Sat Nov 26 08:57:25 2016 +0530
Committer: Noble Paul <noble@apache.org>
Committed: Sat Nov 26 08:57:25 2016 +0530

----------------------------------------------------------------------
 .../core/src/java/org/apache/solr/util/JsonSchemaValidator.java | 2 +-
 solr/core/src/resources/apispec/core.config.Commands.json       | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6ec8a14f/solr/core/src/resources/apispec/core.config.Commands.json
----------------------------------------------------------------------
diff --cc solr/core/src/resources/apispec/core.config.Commands.json
index d428aee,a7e039a..6dc8d4a
--- a/solr/core/src/resources/apispec/core.config.Commands.json
+++ b/solr/core/src/resources/apispec/core.config.Commands.json
@@@ -147,9 -147,9 +147,8 @@@
        "additionalProperties": true
      },
      "update-listener": {
-       "#extends#":"core.config.Commands.generic",
 -      "type":"object",
--      "description":"",
--      "documentation":""
++      "type": "object",
++      "additionalProperties": true
      },
      "delete-listener": {
        "type": "array",


Mime
View raw message