summaryrefslogtreecommitdiffstats
path: root/catalog-ui
AgeCommit message (Expand)AuthorFilesLines
2018-03-07Sync Integ to MasterMichael Lando230-961/+4707<
# Copyright (c) 2017 Wind River Systems, Inc.
# Copyright (c) 2017-2018 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
#       http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

from django.conf.urls import include, url

urlpatterns = [
    url(r'^', include('multivimbroker.swagger.urls')),
    url(r'^', include('multivimbroker.forwarder.urls')),
]
> 2017-08-13[SDC-235] rebase codeMichael Lando1-1/+4 2017-08-10[SDC] code syncMichael Lando6-30/+93 2017-08-07[SDC] code syncMichael Lando4-11/+22 2017-08-02[SDC] code rebase for sdc resync to LFAvi Ziv58-787/+469 2017-07-22[sdc] 1710 rebase codeMichael Lando12-57/+97 2017-07-20[SDC] 1710 rebase + pom modificationsMichael Lando12-167/+52 2017-07-18[SDC] rebase 1710Michael Lando34-59/+512 2017-07-17[SDC] rebase 1710 codeMichael Lando107-1697/+1023 2017-07-16[sdc] - merged 1707_build into sdc LFIdan Amit1-8/+8 2017-07-12[sdc] rebase updateMichael Lando421-31897/+6184 2017-07-03[sdc] - last merges before moving to LFTal Gitelman29-153/+299 2017-06-29[SDC] rebase codeTal Gitelman18-188/+160 2017-06-19[sdc] update to the current code baseMichael Lando16-42/+92 2017-06-18[sdc] update code of sdcMichael Lando33-349/+385 2017-06-11[SDC-29] rebase continue work to align sourceMichael Lando86-1592/+1684 2017-06-09[SDC-29] catalog 1707 rebase commit.Michael Lando1176-44429/+37066 2017-03-15update pom version + change version fileMichael Lando1-1/+1 2017-02-20Fix UI and dockerml636r1-32/+47 2017-02-19Add UI partml636r1-136/+156 2017-02-19Initial OpenECOMP SDC commitMichael Lando776-0/+129835