summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2012-11-08 12:31:10 -0500
committerAnand Avati <avati@redhat.com>2012-11-21 14:57:22 -0800
commita64a0d89d5256386f6773709477aea87823e2e68 (patch)
treebff3a41ca7658098f945a86f2b1035c2faf49bf5
parent94ddaecadbb12c5e67617553b067554a657980a1 (diff)
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>
-rwxr-xr-x.unittests4
-rwxr-xr-xufo/.unittests (renamed from swift/1.4.8/.unittests)0
-rw-r--r--ufo/README (renamed from swift/1.4.8/README)0
-rwxr-xr-xufo/bin/gluster-swift-gen-builders (renamed from swift/1.4.8/bin/gluster-swift-gen-builders)0
-rw-r--r--ufo/etc/account-server/1.conf-gluster (renamed from swift/1.4.8/etc/account-server/1.conf-gluster)0
-rw-r--r--ufo/etc/container-server/1.conf-gluster (renamed from swift/1.4.8/etc/container-server/1.conf-gluster)0
-rw-r--r--ufo/etc/fs.conf-gluster (renamed from swift/1.4.8/etc/fs.conf-gluster)0
-rw-r--r--ufo/etc/object-server/1.conf-gluster (renamed from swift/1.4.8/etc/object-server/1.conf-gluster)0
-rw-r--r--ufo/etc/proxy-server.conf-gluster (renamed from swift/1.4.8/etc/proxy-server.conf-gluster)0
-rw-r--r--ufo/etc/swift.conf-gluster (renamed from swift/1.4.8/etc/swift.conf-gluster)0
-rw-r--r--ufo/gluster-swift-ufo.spec (renamed from swift/1.4.8/gluster-swift-ufo.spec)0
-rw-r--r--ufo/gluster/__init__.py (renamed from swift/1.4.8/gluster/__init__.py)0
-rw-r--r--ufo/gluster/swift/__init__.py (renamed from swift/1.4.8/gluster/swift/__init__.py)0
-rw-r--r--ufo/gluster/swift/account/__init__.py (renamed from swift/1.4.8/gluster/swift/account/__init__.py)0
-rw-r--r--ufo/gluster/swift/account/server.py (renamed from swift/1.4.8/gluster/swift/account/server.py)0
-rw-r--r--ufo/gluster/swift/common/DiskDir.py (renamed from swift/1.4.8/gluster/swift/common/DiskDir.py)0
-rw-r--r--ufo/gluster/swift/common/DiskFile.py (renamed from swift/1.4.8/gluster/swift/common/DiskFile.py)0
-rw-r--r--ufo/gluster/swift/common/Glusterfs.py (renamed from swift/1.4.8/gluster/swift/common/Glusterfs.py)0
-rw-r--r--ufo/gluster/swift/common/__init__.py (renamed from swift/1.4.8/gluster/swift/common/__init__.py)0
-rw-r--r--ufo/gluster/swift/common/constraints.py (renamed from swift/1.4.8/gluster/swift/common/constraints.py)0
-rw-r--r--ufo/gluster/swift/common/fs_utils.py (renamed from swift/1.4.8/gluster/swift/common/fs_utils.py)0
-rw-r--r--ufo/gluster/swift/common/middleware/__init__.py (renamed from swift/1.4.8/gluster/swift/common/middleware/__init__.py)0
-rw-r--r--ufo/gluster/swift/common/middleware/gluster.py (renamed from swift/1.4.8/gluster/swift/common/middleware/gluster.py)0
-rw-r--r--ufo/gluster/swift/common/utils.py (renamed from swift/1.4.8/gluster/swift/common/utils.py)0
-rw-r--r--ufo/gluster/swift/container/__init__.py (renamed from swift/1.4.8/gluster/swift/container/__init__.py)0
-rw-r--r--ufo/gluster/swift/container/server.py (renamed from swift/1.4.8/gluster/swift/container/server.py)0
-rw-r--r--ufo/gluster/swift/obj/__init__.py (renamed from swift/1.4.8/gluster/swift/obj/__init__.py)0
-rw-r--r--ufo/gluster/swift/obj/server.py (renamed from swift/1.4.8/gluster/swift/obj/server.py)0
-rw-r--r--ufo/gluster/swift/proxy/__init__.py (renamed from swift/1.4.8/gluster/swift/proxy/__init__.py)0
-rw-r--r--ufo/gluster/swift/proxy/server.py (renamed from swift/1.4.8/gluster/swift/proxy/server.py)0
-rw-r--r--ufo/setup.py (renamed from swift/1.4.8/setup.py)0
-rw-r--r--ufo/test/__init__.py (renamed from swift/1.4.8/test/__init__.py)0
-rw-r--r--ufo/test/unit/__init__.py (renamed from swift/1.4.8/test/unit/__init__.py)0
-rw-r--r--ufo/test/unit/common/__init__.py (renamed from swift/1.4.8/test/unit/common/__init__.py)0
-rw-r--r--ufo/test/unit/common/data/account_tree.tar.bz2 (renamed from swift/1.4.8/test/unit/common/data/account_tree.tar.bz2)bin228 -> 228 bytes
-rw-r--r--ufo/test/unit/common/data/container_tree.tar.bz2 (renamed from swift/1.4.8/test/unit/common/data/container_tree.tar.bz2)bin282 -> 282 bytes
-rw-r--r--ufo/test/unit/common/test_utils.py (renamed from swift/1.4.8/test/unit/common/test_utils.py)0
37 files changed, 2 insertions, 2 deletions
diff --git a/.unittests b/.unittests
index d13fd45a3..ad2a3a34a 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 2cee10be5..2cee10be5 100755
--- a/swift/1.4.8/.unittests
+++ b/ufo/.unittests
diff --git a/swift/1.4.8/README b/ufo/README
index 9efd918b5..9efd918b5 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 b89cd15fb..b89cd15fb 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 da8f31726..da8f31726 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 acad62135..acad62135 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 bbbdc2bd1..bbbdc2bd1 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 fe157a9b5..fe157a9b5 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 30eb745bf..30eb745bf 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 25c3ca157..25c3ca157 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 55b192a27..55b192a27 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 e69de29bb..e69de29bb 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 17578ebee..17578ebee 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 e69de29bb..e69de29bb 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 8b9831579..8b9831579 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 8602fabae..8602fabae 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 6404be6d6..6404be6d6 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 2d3273ed4..2d3273ed4 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 e69de29bb..e69de29bb 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 a4fc8008c..a4fc8008c 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 7f5292c2b..7f5292c2b 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 e69de29bb..e69de29bb 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 ab63c51e1..ab63c51e1 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 56376f8ee..56376f8ee 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 e69de29bb..e69de29bb 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 e2a197302..e2a197302 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 e69de29bb..e69de29bb 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 43cdd8890..43cdd8890 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 e69de29bb..e69de29bb 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 792a97df9..792a97df9 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 a48310282..a48310282 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 cb23e4dd7..cb23e4dd7 100644
--- a/swift/1.4.8/test/unit/common/data/account_tree.tar.bz2
+++ b/ufo/test/unit/common/data/account_tree.tar.bz2
Binary files differ
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 b4a149285..b4a149285 100644
--- a/swift/1.4.8/test/unit/common/data/container_tree.tar.bz2
+++ b/ufo/test/unit/common/data/container_tree.tar.bz2
Binary files differ
diff --git a/swift/1.4.8/test/unit/common/test_utils.py b/ufo/test/unit/common/test_utils.py
index ec66324a0..ec66324a0 100644
--- a/swift/1.4.8/test/unit/common/test_utils.py
+++ b/ufo/test/unit/common/test_utils.py