summaryrefslogtreecommitdiffstats
path: root/legacy/api/router/mapper.py.orig
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2017-09-18 13:46:43 +0800
committerzhihui wu <wu.zhihui1@zte.com.cn>2017-09-18 13:46:43 +0800
commit5d67fdf522b7ba460f8337e3c6cfea3b340c46f8 (patch)
tree23ebd4b11ccc15e49242fc13803897ebdc6e28d5 /legacy/api/router/mapper.py.orig
parent25086394f9ebd7bd90698ea54734f27ee9d4517e (diff)
delete legacy code from branch stable/euphrates
This directory doesn't need to publish in euphrates. Change-Id: I2d88b85c272ca3df6cc504e08968e9432e2dd96d Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
Diffstat (limited to 'legacy/api/router/mapper.py.orig')
-rw-r--r--legacy/api/router/mapper.py.orig19
1 files changed, 0 insertions, 19 deletions
diff --git a/legacy/api/router/mapper.py.orig b/legacy/api/router/mapper.py.orig
deleted file mode 100644
index 1acb40b5..00000000
--- a/legacy/api/router/mapper.py.orig
+++ /dev/null
@@ -1,19 +0,0 @@
-<<<<<<< HEAD
-from legacy.api.handler.job_handler import Job, JobList
-=======
-##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-from legacy.api.handler import Job, JobList
->>>>>>> 615b529... Add licence header according to OPNFV contribution guidelines[1] by script[2]
-
-
-mappers = [
- (JobList, '/api/v1.0/jobs'),
- (Job, '/api/v1.0/jobs/<string:id>'),
-]