From: Sage Weil <sage@inktank.com>
Date: Tue, 3 Jul 2012 04:24:56 +0000 (-0700)
Subject: Merge tag 'v0.48argonaut'
X-Git-Tag: v0.49~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d347cc8942fca284c2f81083f044aeff4b9ee23f;p=ceph.git

Merge tag 'v0.48argonaut'

v0.48argonaut
---

d347cc8942fca284c2f81083f044aeff4b9ee23f
diff --cc ceph.spec.in
index 461bd1fd1f37,382f7fc55f59..c69f3c45d11e
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -17,10 -17,10 +17,10 @@@ Name:		cep
  Version:	@VERSION@
  Release:	6%{?dist}
  Summary:	User space components of the Ceph file system
- License:	LGPLv2
+ License:	GPL-2.0
  Group:		System Environment/Base
 -URL:		http://ceph.newdream.net/
 -Source0:	http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
 +URL:		http://ceph.com/
 +Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
  Requires:	librbd1 = %{version}-%{release}
  Requires:	librados2 = %{version}-%{release}
  Requires:	libcephfs1 = %{version}-%{release}