osm.etsi.org Git - osm/NBI.git/commit

projects / osm / NBI.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2e4c2a0 f2af4a1)

author	Mark Beierl <mark.beierl@canonical.com>
	Thu, 9 Feb 2023 20:17:20 +0000 (15:17 -0500)
committer	Mark Beierl <mark.beierl@canonical.com>
	Thu, 9 Feb 2023 20:26:26 +0000 (15:26 -0500)
commit	c54e3be9ab71ec448b99c000adda9f8f2f60cabd
tree	078555029024ab02aa7a50a50c666a8fcbe0a6e6	tree \| snapshot
parent	2e4c2a03a722dacab7fda81447b3f464d6643705	commit \| diff
parent	f2af4a100d308e07f355d61b94fb27d1ccc97aa2	commit \| diff

Merge remote-tracking branch 'origin/master' into paas

Change-Id: I81586040405620a2c19d0ac98835cfa90468523e
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

12 files changed:

osm_nbi/admin_topics.py	diff1 \|	diff2 \|	blob \| history
osm_nbi/authconn_keystone.py	diff1 \|	diff2 \|	blob \| history
osm_nbi/descriptor_topics.py	diff1 \|	diff2 \|	blob \| history
osm_nbi/instance_topics.py	diff1 \|	diff2 \|	blob \| history
osm_nbi/notifications.py	diff1 \|	diff2 \|	blob \| history
osm_nbi/osm_vnfm/vnf_instances.py	diff1 \|	diff2 \|	blob \| history
osm_nbi/subscriptions.py	diff1 \|	diff2 \|	blob \| history
osm_nbi/tests/run_test.py	diff1 \|	diff2 \|	blob \| history
requirements-dev.in	diff1 \|	diff2 \|	blob \| history
requirements-dev.txt	diff1 \|	diff2 \|	blob \| history
requirements-test.txt	diff1 \|	diff2 \|	blob \| history
requirements.txt	diff1 \|	diff2 \|	blob \| history