object-storage: del 1.4.8 ref from dir hierarchy

Remove the "swift/1.4.8" directory from the hierarchy, replacing it with "ufo".

Change-Id: I60ba171182d7402a2193616c1c95c90cd2ead5bc
BUG: 870589
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/4200
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pete Zaitcev <zaitcev@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>

37 files changed, 2 insertions, 2 deletions

diff --git a/.unittests b/.unittests
index d13fd45a368..ad2a3a34aed 100755
--- a/.unittests
+++ b/.unittests
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd swift/1.4.8/
-./.unittests
+cd ufo
+./.unittests $@
 cd -
diff --git a/swift/1.4.8/.unittests b/ufo/.unittests
index 2cee10be531..2cee10be531 100755
--- a/swift/1.4.8/.unittests
+++ b/ufo/.unittests
diff --git a/swift/1.4.8/README b/ufo/README
index 9efd918b59a..9efd918b59a 100644
--- a/swift/1.4.8/README
+++ b/ufo/README
diff --git a/swift/1.4.8/bin/gluster-swift-gen-builders b/ufo/bin/gluster-swift-gen-builders
index b89cd15fb00..b89cd15fb00 100755
--- a/swift/1.4.8/bin/gluster-swift-gen-builders
+++ b/ufo/bin/gluster-swift-gen-builders
diff --git a/swift/1.4.8/etc/account-server/1.conf-gluster b/ufo/etc/account-server/1.conf-gluster
index da8f3172634..da8f3172634 100644
--- a/swift/1.4.8/etc/account-server/1.conf-gluster
+++ b/ufo/etc/account-server/1.conf-gluster
diff --git a/swift/1.4.8/etc/container-server/1.conf-gluster b/ufo/etc/container-server/1.conf-gluster
index acad6213543..acad6213543 100644
--- a/swift/1.4.8/etc/container-server/1.conf-gluster
+++ b/ufo/etc/container-server/1.conf-gluster
diff --git a/swift/1.4.8/etc/fs.conf-gluster b/ufo/etc/fs.conf-gluster
index bbbdc2bd10d..bbbdc2bd10d 100644
--- a/swift/1.4.8/etc/fs.conf-gluster
+++ b/ufo/etc/fs.conf-gluster
diff --git a/swift/1.4.8/etc/object-server/1.conf-gluster b/ufo/etc/object-server/1.conf-gluster
index fe157a9b53d..fe157a9b53d 100644
--- a/swift/1.4.8/etc/object-server/1.conf-gluster
+++ b/ufo/etc/object-server/1.conf-gluster
diff --git a/swift/1.4.8/etc/proxy-server.conf-gluster b/ufo/etc/proxy-server.conf-gluster
index 30eb745bff8..30eb745bff8 100644
--- a/swift/1.4.8/etc/proxy-server.conf-gluster
+++ b/ufo/etc/proxy-server.conf-gluster
diff --git a/swift/1.4.8/etc/swift.conf-gluster b/ufo/etc/swift.conf-gluster
index 25c3ca1571f..25c3ca1571f 100644
--- a/swift/1.4.8/etc/swift.conf-gluster
+++ b/ufo/etc/swift.conf-gluster
diff --git a/swift/1.4.8/gluster-swift-ufo.spec b/ufo/gluster-swift-ufo.spec
index 55b192a27ed..55b192a27ed 100644
--- a/swift/1.4.8/gluster-swift-ufo.spec
+++ b/ufo/gluster-swift-ufo.spec
diff --git a/swift/1.4.8/gluster/__init__.py b/ufo/gluster/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/gluster/__init__.py
+++ b/ufo/gluster/__init__.py
diff --git a/swift/1.4.8/gluster/swift/__init__.py b/ufo/gluster/swift/__init__.py
index 17578ebee40..17578ebee40 100644
--- a/swift/1.4.8/gluster/swift/__init__.py
+++ b/ufo/gluster/swift/__init__.py
diff --git a/swift/1.4.8/gluster/swift/account/__init__.py b/ufo/gluster/swift/account/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/gluster/swift/account/__init__.py
+++ b/ufo/gluster/swift/account/__init__.py
diff --git a/swift/1.4.8/gluster/swift/account/server.py b/ufo/gluster/swift/account/server.py
index 8b98315790a..8b98315790a 100644
--- a/swift/1.4.8/gluster/swift/account/server.py
+++ b/ufo/gluster/swift/account/server.py
diff --git a/swift/1.4.8/gluster/swift/common/DiskDir.py b/ufo/gluster/swift/common/DiskDir.py
index 8602fabae83..8602fabae83 100644
--- a/swift/1.4.8/gluster/swift/common/DiskDir.py
+++ b/ufo/gluster/swift/common/DiskDir.py
diff --git a/swift/1.4.8/gluster/swift/common/DiskFile.py b/ufo/gluster/swift/common/DiskFile.py
index 6404be6d68f..6404be6d68f 100644
--- a/swift/1.4.8/gluster/swift/common/DiskFile.py
+++ b/ufo/gluster/swift/common/DiskFile.py
diff --git a/swift/1.4.8/gluster/swift/common/Glusterfs.py b/ufo/gluster/swift/common/Glusterfs.py
index 2d3273ed429..2d3273ed429 100644
--- a/swift/1.4.8/gluster/swift/common/Glusterfs.py
+++ b/ufo/gluster/swift/common/Glusterfs.py
diff --git a/swift/1.4.8/gluster/swift/common/__init__.py b/ufo/gluster/swift/common/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/gluster/swift/common/__init__.py
+++ b/ufo/gluster/swift/common/__init__.py
diff --git a/swift/1.4.8/gluster/swift/common/constraints.py b/ufo/gluster/swift/common/constraints.py
index a4fc8008c7e..a4fc8008c7e 100644
--- a/swift/1.4.8/gluster/swift/common/constraints.py
+++ b/ufo/gluster/swift/common/constraints.py
diff --git a/swift/1.4.8/gluster/swift/common/fs_utils.py b/ufo/gluster/swift/common/fs_utils.py
index 7f5292c2bf1..7f5292c2bf1 100644
--- a/swift/1.4.8/gluster/swift/common/fs_utils.py
+++ b/ufo/gluster/swift/common/fs_utils.py
diff --git a/swift/1.4.8/gluster/swift/common/middleware/__init__.py b/ufo/gluster/swift/common/middleware/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/gluster/swift/common/middleware/__init__.py
+++ b/ufo/gluster/swift/common/middleware/__init__.py
diff --git a/swift/1.4.8/gluster/swift/common/middleware/gluster.py b/ufo/gluster/swift/common/middleware/gluster.py
index ab63c51e12f..ab63c51e12f 100644
--- a/swift/1.4.8/gluster/swift/common/middleware/gluster.py
+++ b/ufo/gluster/swift/common/middleware/gluster.py
diff --git a/swift/1.4.8/gluster/swift/common/utils.py b/ufo/gluster/swift/common/utils.py
index 56376f8eed5..56376f8eed5 100644
--- a/swift/1.4.8/gluster/swift/common/utils.py
+++ b/ufo/gluster/swift/common/utils.py
diff --git a/swift/1.4.8/gluster/swift/container/__init__.py b/ufo/gluster/swift/container/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/gluster/swift/container/__init__.py
+++ b/ufo/gluster/swift/container/__init__.py
diff --git a/swift/1.4.8/gluster/swift/container/server.py b/ufo/gluster/swift/container/server.py
index e2a19730220..e2a19730220 100644
--- a/swift/1.4.8/gluster/swift/container/server.py
+++ b/ufo/gluster/swift/container/server.py
diff --git a/swift/1.4.8/gluster/swift/obj/__init__.py b/ufo/gluster/swift/obj/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/gluster/swift/obj/__init__.py
+++ b/ufo/gluster/swift/obj/__init__.py
diff --git a/swift/1.4.8/gluster/swift/obj/server.py b/ufo/gluster/swift/obj/server.py
index 43cdd8890d2..43cdd8890d2 100644
--- a/swift/1.4.8/gluster/swift/obj/server.py
+++ b/ufo/gluster/swift/obj/server.py
diff --git a/swift/1.4.8/gluster/swift/proxy/__init__.py b/ufo/gluster/swift/proxy/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/gluster/swift/proxy/__init__.py
+++ b/ufo/gluster/swift/proxy/__init__.py
diff --git a/swift/1.4.8/gluster/swift/proxy/server.py b/ufo/gluster/swift/proxy/server.py
index 792a97df9a2..792a97df9a2 100644
--- a/swift/1.4.8/gluster/swift/proxy/server.py
+++ b/ufo/gluster/swift/proxy/server.py
diff --git a/swift/1.4.8/setup.py b/ufo/setup.py
index a48310282d9..a48310282d9 100644
--- a/swift/1.4.8/setup.py
+++ b/ufo/setup.py
diff --git a/swift/1.4.8/test/__init__.py b/ufo/test/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/test/__init__.py
+++ b/ufo/test/__init__.py
diff --git a/swift/1.4.8/test/unit/__init__.py b/ufo/test/unit/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/test/unit/__init__.py
+++ b/ufo/test/unit/__init__.py
diff --git a/swift/1.4.8/test/unit/common/__init__.py b/ufo/test/unit/common/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/swift/1.4.8/test/unit/common/__init__.py
+++ b/ufo/test/unit/common/__init__.py
diff --git a/swift/1.4.8/test/unit/common/data/account_tree.tar.bz2 b/ufo/test/unit/common/data/account_tree.tar.bz2
index cb23e4dd71b..cb23e4dd71b 100644
--- a/swift/1.4.8/test/unit/common/data/account_tree.tar.bz2
+++ b/ufo/test/unit/common/data/account_tree.tar.bz2
diff --git a/swift/1.4.8/test/unit/common/data/container_tree.tar.bz2 b/ufo/test/unit/common/data/container_tree.tar.bz2
index b4a14928570..b4a14928570 100644
--- a/swift/1.4.8/test/unit/common/data/container_tree.tar.bz2
+++ b/ufo/test/unit/common/data/container_tree.tar.bz2
diff --git a/swift/1.4.8/test/unit/common/test_utils.py b/ufo/test/unit/common/test_utils.py
index ec66324a052..ec66324a052 100644
--- a/swift/1.4.8/test/unit/common/test_utils.py
+++ b/ufo/test/unit/common/test_utils.py