Juju Charms Collection
solr package

Merge lp:~jorge/charms/precise/solr/fix-metadata into lp:charms/solr

  1. Precise Pangolin (12.04)
  2. fix-metadata
  3. Merge into trunk
Proposed by Jorge Castro
Status: Rejected
Rejected by: Tim Van Steenburgh
Proposed branch: lp:~jorge/charms/precise/solr/fix-metadata
Merge into: lp:charms/solr
Diff against target: 133 lines (+18/-16)
2 files modified
config.yaml (+16/-16)
metadata.yaml (+2/-0)
To merge this branch: bzr merge lp:~jorge/charms/precise/solr/fix-metadata
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Needs Fixing
Review Queue (community) automated testing Needs Fixing
Review via email: mp+239431@code.launchpad.net

Description of the change

Fix metadata and config to pass proof.

To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote :

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1284-results

review: Needs Fixing (automated testing)
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

Hey Jorge, the changes to the default values should be reverted as they are not equivalent (null != ""). Note that a default key with no value will still pass proof.

review: Needs Fixing

Unmerged revisions

7. By Jorge Castro

Fix metadata and config to pass proof.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-09-09 01:25:24 +0000
3+++ config.yaml 2014-10-23 17:53:49 +0000
4@@ -7,35 +7,35 @@
5 Lucene index version to use.
6 schema:
7 type: string
8- default:
9+ default: ""
10 description: |
11 Solr XML schema (base64 encoded).
12 dih-config:
13 type: string
14- default:
15+ default: ""
16 description: |
17 Data Import Handler XML configuration (base64 encoded).
18 .
19 "Note: 'dataSource' element will be ignored."
20 db-config:
21 type: string
22- default:
23+ default: ""
24 description: |
25 Database relation configuration.
26 # Solr passwords
27 admin-password:
28 type: string
29- default:
30+ default: ""
31 description: |
32 "Solr admin ('solr-admin') password."
33 update-password:
34 type: string
35- default:
36+ default: ""
37 description: |
38 "Solr update ('solr-update') password."
39 search-password:
40 type: string
41- default:
42+ default: ""
43 description: |
44 "Solr search ('solr-search') password."
45 # Distribution
46@@ -68,12 +68,12 @@
47 Use localhost over LAN hostname in connections. Useful for SSH tunnels.
48 jmx-control-password:
49 type: string
50- default:
51+ default: ""
52 description: |
53 JMX control password.
54 jmx-monitor-password:
55 type: string
56- default:
57+ default: ""
58 description: |
59 JMX monitor password.
60
61@@ -86,12 +86,12 @@
62 "Enable core 1."
63 core1-schema:
64 type: string
65- default:
66+ default: ""
67 description: |
68 Solr XML schema (base64 encoded).
69 core1-dih-config:
70 type: string
71- default:
72+ default: ""
73 description: |
74 Data Import Handler XML configuration (base64 encoded).
75 .
76@@ -105,12 +105,12 @@
77 "Enable core 2."
78 core2-schema:
79 type: string
80- default:
81+ default: ""
82 description: |
83 Solr XML schema (base64 encoded).
84 core2-dih-config:
85 type: string
86- default:
87+ default: ""
88 description: |
89 Data Import Handler XML configuration (base64 encoded).
90 .
91@@ -124,12 +124,12 @@
92 "Enable core 3."
93 core3-schema:
94 type: string
95- default:
96+ default: ""
97 description: |
98 Solr XML schema (base64 encoded).
99 core3-dih-config:
100 type: string
101- default:
102+ default: ""
103 description: |
104 Data Import Handler XML configuration (base64 encoded).
105 .
106@@ -143,12 +143,12 @@
107 "Enable core 4."
108 core4-schema:
109 type: string
110- default:
111+ default: ""
112 description: |
113 Solr XML schema (base64 encoded).
114 core4-dih-config:
115 type: string
116- default:
117+ default: ""
118 description: |
119 Data Import Handler XML configuration (base64 encoded).
120 .
121
122=== modified file 'metadata.yaml'
123--- metadata.yaml 2012-05-22 09:24:45 +0000
124+++ metadata.yaml 2014-10-23 17:53:49 +0000
125@@ -7,6 +7,8 @@
126 Solr is an open source enterprise search server based on the Lucene
127 Java search library, with XML/HTTP and JSON APIs, hit highlighting,
128 faceted search, caching, replication, and a web administration interface.
129+tags:
130+ - analytics
131 provides:
132 master:
133 interface: solr

Subscribers

People subscribed via source and target branches

to all changes: