lp:~ubuntu-branches/ubuntu/natty/ceph/natty-201103250159

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/natty/ceph

Ubuntu branches: Pending requested 2011-03-28

Diff: 2653 lines (+2008/-64) (has conflicts)

37 files modified

.pc/.version (+1/-0)
.pc/applied-patches (+1/-0)
.pc/fix-mkcephfs-path.patch/src/Makefile.am (+772/-0)
configure (+37/-0)
configure.ac (+8/-0)
debian/ceph.install (+41/-0)
debian/ceph.lintian (+4/-0)
debian/ceph.lintian-overrides (+7/-0)
debian/ceph.logrotate (+9/-0)
debian/changelog (+24/-0)
debian/compat (+4/-0)
debian/control (+213/-0)
debian/copyright (+69/-0)
debian/libceph1-dev.install (+6/-0)
debian/libceph1.install (+5/-0)
debian/libcrush1-dev.install (+9/-0)
debian/libcrush1.install (+5/-0)
debian/librados1-dev.install (+13/-0)
debian/librados1.install (+5/-0)
debian/move_dbg_files.sh (+8/-0)
debian/rules (+68/-0)
debian/source/format (+4/-0)
src/.git_version (+4/-0)
src/client/Client.cc (+18/-0)
src/common/signal.cc (+163/-0)
src/include/ceph_strings.cc (+6/-0)
src/include/rados.h (+11/-0)
src/mds/MDS.cc (+6/-0)
src/mon/MDSMonitor.cc (+9/-0)
src/msg/Message.cc (+6/-0)
src/msg/Message.h (+4/-0)
src/os/FileStore.cc (+45/-0)
src/osd/OSD.cc (+50/-0)
src/osd/OSD.h (+4/-0)
src/osd/PG.cc (+328/-64)
src/osd/PG.h (+15/-0)
src/osd/ReplicatedPG.cc (+26/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6. By Micah Gersten on 2011-02-13

debian/control: add Homepage

5. By Clint Byrum on 2011-02-07

* Removed .la files from libceph1-dev, libcrush1-dev and
  librados1-dev (per Debian policy v3.9.1 10.2).
* debian/watch: added watch file

4. By Clint Byrum on 2011-02-07

* New upstream release. (LP: #658670, LP: #684011)
* debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
* Removed .la files from libcrush1-dev and librados1-dev (per Debian
  policy v3.9.1 10.2).
* debian/control: adding pkg-config as a build dependency
* debian/control: depend on libcrypto++-dev instead of libssl-dev

3. By Clint Byrum on 2011-02-07

New upstream release.

2. By Clint Byrum on 2010-07-30

Initial release based on upstream package (LP: #607730)

1. By Clint Byrum on 2010-07-30

Import upstream version 0.21