Browse code

Merge "install memcached for swift via files"

Jenkins authored on 2012/11/15 22:06:21
Showing 3 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 curl
2 2
 gcc
3
-memcached # NOPRIME
3
+memcached
4 4
 python-configobj
5 5
 python-coverage
6 6
 python-dev
... ...
@@ -1,6 +1,6 @@
1 1
 curl
2 2
 gcc
3
-memcached # NOPRIME
3
+memcached
4 4
 python-configobj
5 5
 python-coverage
6 6
 python-devel
... ...
@@ -779,11 +779,6 @@ if is_service_enabled q-agt; then
779 779
     fi
780 780
 fi
781 781
 
782
-if is_service_enabled swift; then
783
-    # Install memcached for swift.
784
-    install_package memcached
785
-fi
786
-
787 782
 TRACK_DEPENDS=${TRACK_DEPENDS:-False}
788 783
 
789 784
 # Install python packages into a virtualenv so that we can track them