[ceph/el6] (12 commits) ...Merge remote-tracking branch 'origin' into el6

Wed May 14 01:02:48 UTC 2014

Summary of changes:

  522d4bf... re-enable tmalloc on arm now gperftools is fixed (*)
  e11916a... Merge branch 'master' into f19 (*)
  77906ca... - fix a sample.conf problem (*)
  8ee25c7... Merge branch 'master' into f19 (*)
  975579a... gperftools not currently available on aarch64 (*)
  a69f025... build without tcmalloc on aarch64 (no gperftools) (*)
  c523b37... Update to latest stable upstream release (*)
  f07f612... Merge branch 'master' into epel7 (*)
  b4b867b... remove trailing whitespace (*)
  4c912ae... Move plugins from -devel into -libs package (#891993) (*)
  f082c04... Update to latest stable upstream release, BZ 1095201 (*)
  4e33e00... Merge remote-tracking branch 'origin' into el6

(*) This commit already existed in another branch; no separate mail sent