[zookeeper/f21: 2/2] Merge branch 'f20' into f21

[tstclair]

commit a9ea624e7e6824d6660778265224a48798643479
Merge: fb05f8b 8ba2394
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Tue Oct 21 16:03:48 2014 -0500

    Merge branch 'f20' into f21
    
    Conflicts:
    	zookeeper.spec

 zkEnv.sh                     |   32 +++-----------------------------
 zookeeper-3.4.6-server.patch |   20 ++++++++++++++++++++
 zookeeper.service            |   11 +++++++++--
 zookeeper.spec               |   20 ++++++++++++++------
 4 files changed, 46 insertions(+), 37 deletions(-)
---