[ceph/el6: 3/3] Merge remote-tracking branch 'origin' into el6

[Kaleb S. KEITHLEY]

commit 454fb3d60db77de88a9dafd217d3150497c048dd
Merge: 897c4bb 9a1331d
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Jul 7 08:31:43 2014 -0400

    Merge remote-tracking branch 'origin' into el6

 ceph.spec |  733 +++++++++++++++----------------------------------------------
 1 files changed, 179 insertions(+), 554 deletions(-)
---