lp:~james-page/ubuntu/oneiric/eucalyptus/google-fix
- Get this branch:
- bzr branch lp:~james-page/ubuntu/oneiric/eucalyptus/google-fix
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 3229 lines (+2785/-26)35 files modified.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/StatefulMessageSet.java (+111/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java (+68/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/ClusterAllocator.java (+322/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/configuration/src/main/java/com/eucalyptus/config/Configuration.java (+229/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/StorageUtil.java (+172/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java (+224/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java (+327/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/component/DefaultServiceBuilder.java (+73/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurationProperties.java (+151/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyDirectory.java (+153/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java (+137/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/event/ReentrantListenerRegistry.java (+96/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/msgs/src/main/java/com/eucalyptus/util/Composites.java (+101/-0)
.pc/26-google-collections-1.0-ftbfs.patch/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/RemoteBootstrapperClient.java (+290/-0)
.pc/applied-patches (+1/-0)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/StatefulMessageSet.java (+2/-1)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java (+5/-3)
clc/modules/cluster-manager/src/main/java/com/eucalyptus/sla/ClusterAllocator.java (+1/-1)
clc/modules/configuration/src/main/java/com/eucalyptus/config/Configuration.java (+2/-1)
clc/modules/image-manager/src/main/java/com/eucalyptus/blockstorage/StorageUtil.java (+2/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java (+2/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/component/Component.java (+2/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/component/DefaultServiceBuilder.java (+2/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/ConfigurationProperties.java (+3/-2)
clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertyDirectory.java (+3/-2)
clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java (+1/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/event/ReentrantListenerRegistry.java (+2/-1)
clc/modules/msgs/src/main/java/com/eucalyptus/util/Composites.java (+2/-1)
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/RemoteBootstrapperClient.java (+4/-2)
debian/build-jars (+2/-2)
debian/changelog (+13/-0)
debian/control (+2/-2)
debian/eucalyptus-java-common.links (+3/-3)
debian/patches/26-google-collections-1.0-ftbfs.patch (+276/-0)
debian/patches/series (+1/-0)
Related bugs
Bug #784491: FTBFS against libgoogle-collections-java >= 1.0 | Medium | Fix Released |
Related blueprints
Branch information
- Owner:
- James Page
- Status:
- Development
Recent revisions
- 179. By James Page
-
* Fix FTBFS against libgoogle-
collections- java 1.0 (LP: #784491).
- debian/patches/ 26-google- collections- 1.0-ftbfs. patch: refactoring
to use 1.0 API.
* Fix libjibx-java to version 1.1 to allow entry of libjibx1.2-java
into universe without breaking eucalyptus:
- debian/eucalyptus- java-common. links: use jibx-*-1.1.jar.
- debian/build-jars: use jibx-*-1.1.jar.
- debian/control: use libjibx1.1-java instead of libjibx-java. - 178. By Dave Walker
-
debian/
eucalyptus- network. upstart: Added env IFACE=manual-start,
resolving install and upgrade issue. (LP: #754699) - 177. By Andres Rodriguez
-
* Separate admin tools from eucalyptus-common package(LP: #732082)
- debian/control:
+ Add eucalyptus-admin-tools binary package.
+ Add missing Depends on python-psutil. (LP: #731672)
+ eucalyptus-cloud: Depends on eucalyptus-admin-tools.
- debian/eucalyptus- admin-tools. install: Added.
- debian/eucalyptus- common. install: Drop installation of admin tools.
* Switch to dh_python2 instead of python-central.
- debian/control. Bump Depends on cdbs to (>= 0.4.90~); bump depends on
python to (>= 2.6.6-3).
* Add powernap configs to leverage recent PowerNap changes (LP: #726769):
- debian/powernap/ eucalyptus. conf: Add config.
- debian/eucalyptus- nc.install: Install config.
- debian/eucalyptus- nc.links: Symlink to /etc/powernap/ config. d/.
* debian/control: Change Recommends order of bittorrent to bittornado
first. Allows demontion of bittorrent. (LP: #697753) - 176. By Andres Rodriguez
-
[ Andres Rodriguez ]
* debian/control: Add missing Dep on python-boto for eucalyptus-common.
* Fix packaging to correctly install missing python modules. (LP: #615442)
- debian/control: Add Depends on python-central, python; Add related
python control rules.
- debian/rules: Add dh_pycentral rule for eucalyptus-common
- debian/eucalyptus- comman. install: Install euca_admin into correct dir. [ Dave Walker (Daviey) ]
* debian/changelog: Fixed history from last upload which dropped
2.0.1+bzr1255- 0ubuntu1. - 175. By Dave Walker
-
[ Dave Walker (Daviey) ]
* New upstream snapshot of minor point release, 2.0.1 (r1256).
- Fixes FTBFS, (LP: #687970)
- Stop unauthenticated users being able to reset user password. (LP: #675372).
- Fixes node controller memory leak. (LP: #523211)
- Rearrange of linker options for libEucalyptusNC.so. (LP: #724470)
* Switch from dhcp3-server to isc-dhcp-server as the new default. (LP: #711590)
- debian/:
+ control: eucalyptus-cc, drop Recommends on dhcp3-server and add
isc-dhcp-server as the new default.
+ eucalyptus.conf: Use different dhcpd binary name.
+ patches/{18-priv_ security. patch|08- ubuntu- default- networking. patch},
updated rootwrap to use different dhpcd binary.
* Refreshed 06-UEC-webinterface. patch, dropping hunks now applied upstream.
* Updated standards version to 3.9.1, no changes required.
* debian/control: Updated VCS location.
* debian/source/ include- binaries: Included newer favicon, overiding shipped.
* debian/{local/ registration} /Makefile: Introduced a stanza for, for
re-arranging of Linker flags, resolving FTBFS. Added -Wall.
* debian/*: The binary resulting jars have been updated from *-2.0.0 to
*-2.0.1. References updated as appropriate.
* debian/patches/*: Refreshed patches - 174. By Dave Walker
-
[ Dave Walker (Daviey) ]
* New upstream snapshot of minor point release, 2.0.1 (r1255).
- Fixes FTBFS, (LP: #687970)
- Stop unauthenticated users being able to reset user password. (LP: #675372).
* Switch from dhcp3-server to isc-dhcp-server as the new default. (LP: #711590)
- debian/:
+ control: eucalyptus-cc, drop Recommends on dhcp3-server and add
isc-dhcp-server as the new default.
+ eucalyptus.conf: Use different dhcpd binary name.
+ patches/{18-priv_ security. patch|08- ubuntu- default- networking. patch},
updated rootwrap to use different dhpcd binary.
* Refreshed 06-UEC-webinterface. patch, dropping hunks now applied upstream.
* Updated standards version to 3.9.1, no changes required.
* debian/control: Updated VCS location.
* debian/source/ include- binaries: Included newer favicon, overiding shipped.
* debian/{local/ registration} /Makefile: Introduced a stanza for, for
re-arranging of Linker flags, resolving FTBFS. Added -Wall.
* debian/*: The binary resulting jars have been updated from *-2.0.0 to
*-2.0.1. References updated as appropriate. - 173. By Dave Walker
-
debian/
eucalyptus- java-common. postinst: On upgrades from Lucid/10.04,
ensure eucalyptus is stopped before attempting to upgrade the database
schema. (LP: #649799) - 172. By Dave Walker
-
* debian/
eucalyptus- java-common. {pre|postinst} : Backup /usr/share/ eucalytpus
to enable the euca_upgrade script to be able to properly upgrade
the components. (LP: #646100, #644759)
* debian/patches/ 07-local_ support_ euca_conf- in.patch:
- Do not upgrade /etc/eucalyptus/eucalyptus. local.conf as it shouldn't
contain settings that require updating, and has the undesirable feature
of disabling eucalyptus network settings. (LP: #644733)
- Resolved removal of nodes from nodes.list when deregistering a node
(LP: #640502)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/eucalyptus