Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openstack/horizon/patches/99-remove.xstatic.patch-proto
author Devjani Ray <devjani.ray@oracle.com>
Fri, 05 Feb 2016 17:54:17 -0500
changeset 5405 66fd59fecd68
parent 4196 d697072a92f5
child 6856 356aeea98c39
permissions -rw-r--r--
PSARC 2015/535 OpenStack service updates for Kilo PSARC 2015/458 aioeventlet - asyncio event loop scheduling callbacks in eventlet PSARC 2015/460 msgpack - C/Python bindings for MessagePack (de)serializer data PSARC 2015/466 openstackclient - OpenStack Command-line Client PSARC 2015/467 oslo.versionedobjects - Oslo Versioned Objects library PSARC 2015/468 pint - A physical quantities module PSARC 2015/469 pysaml2 - A pure Python implementation of SAML2 PSARC 2015/471 semantic_version - A library implementing the 'SemVer' scheme PSARC 2015/472 testresources - PyUnit extension for managing expensive test resources PSARC 2015/473 testscenarios - Extensions to Python unittest to support scenarios PSARC 2015/474 trollius - Port of the Tulip project (asyncio module, PEP 3156) on Python 2 PSARC 2015/475 urllib3 - HTTP library with thread-safe connection pooling, file post, and more PSARC 2015/520 oslo.concurrency - Oslo Concurrency library PSARC 2015/521 oslo.log - Oslo Logging Configuration library PSARC 2015/529 oslo.policy - Oslo Policy library PSARC 2015/530 psutil - Python system and process utilities PSARC 2015/538 fixtures - Python module to support reusable state for writing clean tests PSARC 2015/539 sqlparse - An SQL parser module for Python PSARC 2016/017 extras - Useful extra utilities for Python PSARC 2016/018 linecache2 - Port of the standard linecache module PSARC 2016/019 python-mimeparse - Basic functions for parsing mime-types PSARC 2016/020 testtools - Extensions to the Python unit testing framework PSARC 2016/021 traceback2 - Port of the standard traceback module PSARC 2016/014 OpenStack Cinder NFS driver for Solaris 22384068 OpenStack service updates for Kilo (Umbrella) 21974208 The Python module msgpack should be added to Userland 22010630 The Python trollius module should be added to Userland 22011755 The Python module pint should be added to Userland 22012256 The Python aioeventlet module should be added to Userland 22012282 The Python oslo.versionedobjects module should be added to Userland 22012317 The Python semantic_version module should be added to Userland 22012321 The Python testresources module should be added to Userland 22012329 The Python testscenarios module should be added to Userland 22012336 The Python urllib3 module should be added to Userland 22012343 The Python openstackclient module should be added to Userland 22299389 The Python oslo.concurrency module should be added to Userland 22299409 The Python oslo.log module should be added to Userland 22299418 The Python oslo.policy module should be added to Userland 22299469 The Python psutil module should be added to Userland 22337793 The Python sqlparse module should be added to Userland 22338325 The Python fixtures module should be added to Userland 22535728 The Python testtools module should be added to Userland 22535739 The Python extras module should be added to Userland 22535748 The Python linecache2 module should be added to Userland 22535753 The Python traceback2 module should be added to Userland 22535760 The Python python-mimeparse module should be added to Userland 18961001 Image filtering does not function as expected 21678935 NFS for Cinder in Solaris OpenStack 22548630 derived manifest should not enforce presence of global when installing from UAR 22629795 problem in SERVICE/KEYSTONE
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3998
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     1
 
In-house patch to remove the imports of xstatic packages.  These
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     2
 
imports are no longer needed as the static assets are collected at
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     3
 
package time and the xstatic modules are not being delivered.
5bd484384122 PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     4
 












5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




     5


NOTE:  This patch is applied AFTER gmake install has completed rather













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




     6


than during gmake prep.  We need the xstatic functionality to collect













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




     7


all the JavaScript libraries before packaging.













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




     8









5405






66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




     9


--- /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py.orig  2015-05-04 16:35:35.859239557 -0600













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    10


+++ /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py  2015-05-04 16:35:58.697407748 -0600













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    11


@@ -17,99 +17,5 @@ distributions can edit or replace this f













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    12


 to match their distribution's standards.













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    13


 """








3998






5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    14














5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    15


-import xstatic.main













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    16


-import xstatic.pkg.angular








5405






66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    17


-import xstatic.pkg.angular_bootstrap













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    18


-import xstatic.pkg.angular_lrdragndrop













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    19


-import xstatic.pkg.angular_smart_table








3998






5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    20


-import xstatic.pkg.bootstrap_datepicker













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    21


-import xstatic.pkg.bootstrap_scss













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    22


-import xstatic.pkg.d3













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    23


-import xstatic.pkg.font_awesome













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    24


-import xstatic.pkg.hogan













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    25


-import xstatic.pkg.jquery













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    26


-import xstatic.pkg.jquery_migrate













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    27


-import xstatic.pkg.jquery_quicksearch













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    28


-import xstatic.pkg.jquery_tablesorter













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    29


-import xstatic.pkg.jquery_ui













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    30


-import xstatic.pkg.jsencrypt








5405






66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    31


-import xstatic.pkg.magic_search








3998






5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    32


-import xstatic.pkg.rickshaw













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    33


-import xstatic.pkg.spin








5405






66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    34


-import xstatic.pkg.termjs








3998






5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    35


-













5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    36


-








5405






66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    37


 def get_staticfiles_dirs(webroot='/'):













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    38


-    STATICFILES_DIRS = [













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    39


-        ('horizon/lib/angular',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    40


-            xstatic.main.XStatic(xstatic.pkg.angular,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    41


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    42


-        ('horizon/lib/angular',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    43


-            xstatic.main.XStatic(xstatic.pkg.angular_bootstrap,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    44


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    45


-        ('horizon/lib/angular',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    46


-            xstatic.main.XStatic(xstatic.pkg.angular_lrdragndrop,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    47


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    48


-        ('horizon/lib/angular',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    49


-            xstatic.main.XStatic(xstatic.pkg.angular_smart_table,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    50


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    51


-        ('horizon/lib/bootstrap_datepicker',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    52


-            xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    53


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    54


-        ('bootstrap',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    55


-            xstatic.main.XStatic(xstatic.pkg.bootstrap_scss,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    56


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    57


-        ('horizon/lib',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    58


-            xstatic.main.XStatic(xstatic.pkg.d3,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    59


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    60


-        ('horizon/lib',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    61


-            xstatic.main.XStatic(xstatic.pkg.hogan,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    62


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    63


-        ('horizon/lib/font-awesome',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    64


-            xstatic.main.XStatic(xstatic.pkg.font_awesome,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    65


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    66


-        ('horizon/lib/jquery',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    67


-            xstatic.main.XStatic(xstatic.pkg.jquery,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    68


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    69


-        ('horizon/lib/jquery',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    70


-            xstatic.main.XStatic(xstatic.pkg.jquery_migrate,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    71


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    72


-        ('horizon/lib/jquery',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    73


-            xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    74


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    75


-        ('horizon/lib/jquery',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    76


-            xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    77


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    78


-        ('horizon/lib/jsencrypt',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    79


-            xstatic.main.XStatic(xstatic.pkg.jsencrypt,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    80


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    81


-        ('horizon/lib/magic_search',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    82


-            xstatic.main.XStatic(xstatic.pkg.magic_search,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    83


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    84


-        ('horizon/lib',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    85


-            xstatic.main.XStatic(xstatic.pkg.rickshaw,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    86


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    87


-        ('horizon/lib',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    88


-            xstatic.main.XStatic(xstatic.pkg.spin,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    89


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    90


-        ('horizon/lib',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    91


-            xstatic.main.XStatic(xstatic.pkg.termjs,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    92


-                                 root_url=webroot).base_dir),













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    93


-    ]








3998






5bd484384122
PSARC 2015/110 OpenStack service updates for Juno



Danek Duvall <danek.duvall@oracle.com>


parents: 

diff
changeset




    94


-








5405






66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    95


-    if xstatic.main.XStatic(xstatic.pkg.jquery_ui,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    96


-                            root_url=webroot).version.startswith('1.10.'):













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    97


-        # The 1.10.x versions already contain the 'ui' directory.













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    98


-        STATICFILES_DIRS.append(













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




    99


-            ('horizon/lib/jquery-ui',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   100


-             xstatic.main.XStatic(xstatic.pkg.jquery_ui,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   101


-                                  root_url=webroot).base_dir))













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   102


-    else:













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   103


-        # Newer versions dropped the directory, add it to keep the path the













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   104


-        # same.













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   105


-        STATICFILES_DIRS.append(













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   106


-            ('horizon/lib/jquery-ui/ui',













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   107


-             xstatic.main.XStatic(xstatic.pkg.jquery_ui,













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   108


-                                  root_url=webroot).base_dir))













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   109


-













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   110


-    return STATICFILES_DIRS













66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo



Devjani Ray <devjani.ray@oracle.com>


parents: 
4196

diff
changeset




   111


+    return []















upstream/oracle/userland-gate