From ea4750a366123f78411d90082733642376dc6afc Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Mon, 2 Nov 2015 11:55:17 +0530 Subject: Rebase to stable/kilo This change ports most of swiftonfile object server fixes and changes into gluster-swift. Storage policy as a feature is not usable here (it doesn't make sense). The hacky way of creating zero byte tracker objects for object expiration has not been ported to this release due to scalability issues and the need to have a separate volume. Change-Id: I17ba27dacea9ac000bdb8934700996e4d17f4251 Signed-off-by: Prashanth Pai Reviewed-on: http://review.gluster.org/13269 Reviewed-by: Thiago da Silva Tested-by: Thiago da Silva --- .functests | 6 ------ 1 file changed, 6 deletions(-) (limited to '.functests') diff --git a/.functests b/.functests index 6b13b69..c129712 100755 --- a/.functests +++ b/.functests @@ -26,10 +26,4 @@ bash tools/tempauth_functional_tests.sh || EXIT_STATUS=$? # Run functional tests with gswauth as auth middleware bash tools/gswauth_functional_tests.sh || EXIT_STATUS=$? -# Run object expirer functional tests if gsexpiring volume is found. -if mount | grep "gsexpiring on /mnt/gluster-object/gsexpiring type fuse.glusterfs"; then - echo "Running object expirer functional tests" - bash tools/object_expirer_functional.sh || EXIT_STATUS=$? -fi - exit $EXIT_STATUS -- cgit