Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24476452 The Horizon plugin ironic-ui should be added to Userland (fix pkgmerge)
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 30 Sep 2016 21:33:56 -0700
changeset 7017 25872950aa80
parent 7016 401dd746ea8d
child 7018 fdf447a07aff
24476452 The Horizon plugin ironic-ui should be added to Userland (fix pkgmerge)
components/openstack/horizon/horizon.p5m file | annotate | diff | comparison | revisions 
--- a/components/openstack/horizon/horizon.p5m	Fri Sep 30 13:16:50 2016 -0700
+++ b/components/openstack/horizon/horizon.p5m	Fri Sep 30 21:33:56 2016 -0700
@@ -3155,17 +3155,6 @@
 dir  path=var/lib/openstack_dashboard/static owner=webservd group=webservd
 dir  path=var/lib/openstack_dashboard/static/scss owner=webservd group=webservd
 dir  path=var/log/openstack_dashboard owner=webservd group=webservd
-#
-license horizon.license license="Apache v2.0" \
-    com.oracle.info.description="Horizon, the OpenStack web based user interface service" \
-    com.oracle.info.name=$(COMPONENT_NAME) \
-    com.oracle.info.tpno=$(TPNO_HORIZON) \
-    com.oracle.info.version=$(IPS_COMPONENT_VERSION)
-license ironic-ui.license license="Apache v2.0" \
-    com.oracle.info.description="Bare Metal Provisioning Plugin" \
-    com.oracle.info.name=$(COMPONENT_NAME_25) \
-    com.oracle.info.tpno=$(TPNO_IRONIC_UI) \
-    com.oracle.info.version=$(VERSION_IRONIC_UI)
 license bootstrap-datepicker.license \
     license="Apache v2.0 (bootstrap-datepicker)" \
     com.oracle.info.description="Bootstrap Datepicker JavaScript Library" \
@@ -3176,6 +3165,17 @@
     com.oracle.info.description="Hogan JavaScript Library" \
     com.oracle.info.name=$(COMPONENT_NAME_7) \
     com.oracle.info.tpno=$(TPNO_HOGAN) com.oracle.info.version=$(VERSION_HOGAN)
+#
+license horizon.license license="Apache v2.0 (horizon)" \
+    com.oracle.info.description="Horizon, the OpenStack web based user interface service" \
+    com.oracle.info.name=$(COMPONENT_NAME) \
+    com.oracle.info.tpno=$(TPNO_HORIZON) \
+    com.oracle.info.version=$(IPS_COMPONENT_VERSION)
+license ironic-ui.license license="Apache v2.0 (ironic-ui)" \
+    com.oracle.info.description="Bare Metal Provisioning Plugin" \
+    com.oracle.info.name=$(COMPONENT_NAME_25) \
+    com.oracle.info.tpno=$(TPNO_IRONIC_UI) \
+    com.oracle.info.version=$(VERSION_IRONIC_UI)
 license roboto-fontface.license license="Apache v2.0 (roboto-fontface)" \
     com.oracle.info.description="Roboto fontface" \
     com.oracle.info.name=$(COMPONENT_NAME_24) \
upstream/oracle/userland-gate