-
Committer:
Bazaar Package Importer
-
Author(s):
Onkar Shinde
-
Date:
2009-01-31 12:20:00 UTC
-
mfrom:
(1.1.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090131122000-uita1ni48djgczhc
Tags: 1.2.0+ds2-3ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
- debian/patches/ubuntu_07_junit-ignore-online-tests.dpatch:
* Do not fail in tests, if there is no internet connection.
- debian/control, debian/rules
* Re-enable solr-jetty package since Ubuntu still has jetty in archives.