[QPID-832] Merge M2.1 and trunk

• Type: Task
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: M3
• Fix Version/s: M3
• Component/s: .NET Client, Broker-J, C++ Broker, C++ Client, Java Common, Java Performance Tests, Java Tests, JMS AMQP 0-x, Python Client, Python Test Suite, Ruby Client
• Labels: ant_build_system
• Assignee: Unassigned
• Reporter: Aidan Skinner
• Created: 04/Mar/08 13:05
• Updated: 14/Mar/17 17:00
• Resolved: 09/May/08 10:10

Description

M2.1 and trunk should be merged