summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-07 13:39:46 -0500
committerGitHub <noreply@github.com>2016-11-07 13:39:46 -0500
commitba73b286cfd790710b13df46fddc20882238a535 (patch)
tree191a6b8a4f5e35be7489cdcf31f528fb4d19cdff
parent3b29010d8f60b77bc75a1cbef89766edc7b26aae (diff)
parentff221cfa06cbdf9986db91ebfc6b22248bcd6fd7 (diff)
downloadopenshift-ba73b286cfd790710b13df46fddc20882238a535.tar.gz
openshift-ba73b286cfd790710b13df46fddc20882238a535.tar.bz2
openshift-ba73b286cfd790710b13df46fddc20882238a535.tar.xz
openshift-ba73b286cfd790710b13df46fddc20882238a535.zip
Merge pull request #2735 from rhcarvalho/deadcode
Remove some dead code
-rw-r--r--utils/setup.py5
-rw-r--r--utils/src/data/data_file1
-rw-r--r--utils/workflows/enterprise_deploy/openshift.sh2
3 files changed, 0 insertions, 8 deletions
diff --git a/utils/setup.py b/utils/setup.py
index 563897bb1..7909321c9 100644
--- a/utils/setup.py
+++ b/utils/setup.py
@@ -65,11 +65,6 @@ setup(
'ooinstall': ['ansible.cfg', 'ansible-quiet.cfg', 'ansible_plugins/*'],
},
- # Although 'package_data' is the preferred approach, in some case you may
- # need to place data files outside of your packages. See:
- # http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files # noqa
- # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
- #data_files=[('my_data', ['data/data_file'])],
tests_require=['nose'],
test_suite='nose.collector',
diff --git a/utils/src/data/data_file b/utils/src/data/data_file
deleted file mode 100644
index 7c0646bfd..000000000
--- a/utils/src/data/data_file
+++ /dev/null
@@ -1 +0,0 @@
-some data \ No newline at end of file
diff --git a/utils/workflows/enterprise_deploy/openshift.sh b/utils/workflows/enterprise_deploy/openshift.sh
deleted file mode 100644
index 040a9a84d..000000000
--- a/utils/workflows/enterprise_deploy/openshift.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is not used for OpenShift 3.0. It's merely an artifact of the the
-# installation framework originally used for OpenShift 2.x.