Developer build process fix 47/9447/1
authorMark Beierl <mark.beierl@emc.com>
Wed, 3 Feb 2016 22:18:54 +0000 (17:18 -0500)
committerMark Beierl <mark.beierl@emc.com>
Fri, 5 Feb 2016 18:08:02 +0000 (18:08 +0000)
commitc4e424d2de2aa9376ce45b1766bfecdf841ecd3c
tree078d2719a305af06129758791c68942aa23bb9c1
parentc1bcc96e87ba1fc2ad04df372b39e06b07e00057
Developer build process fix

Fix the installation os setuptools so that it
does not conflict with mock.

Change-Id: I7c497d36c80a795fc99b329da2d171a265e4eacc
JIRA: STORPERF-35
Signed-off-by: Mark Beierl <mark.beierl@emc.com>
(cherry picked from commit fd4b99b086583bc8dc91950393ffed646f7eee59)
ci/merge.sh