Merge branch 'release/athing' into develop
Correct version
Merge branch 'hotfix/mavenversions' into develop
Bump versions back in develop
Merge branch 'develop' of github.com:zenoss/zenoss-protocols into develop
fixes ZEN-7923 - reviewed by jpeacock; make the amqp channel FIFO
Merge pull request #4 from zenoss/feature/ZEN-7923

Feature/zen 7923
fixes ZEN-9671 - reviewed by akasim: Make messagesperworker configurable to increase zeneventd performance
Merge pull request #5 from zenoss/feature/ZEN-9671

fixes ZEN-9671 - reviewed by akasim: Make messagesperworker configurable...
Bump versions of everything relevant
Merge pull request #7 from zenoss/feature/updateprotobuf

Bump versions of everything relevant
Merge branch 'master' into develop

Conflicts:
	java/amqp-api/pom.xml
	java/amqp-samples/pom.xml
	java/pom.xml
	java/protobufs/pom.xml
Add a couple more version bumps I missed. Reviewed by jplouis.
Finished release alpha2.
Finished release alpha2.
fixes ZEN-12760: add new addnote api method that does not force indexing
Merge pull request #9 from zenoss/feature/ZEN-12760

fixes ZEN-12760: add new addnote api method that does not force indexing
ZEN-12776: More graceful logging from zope timeout in zeneventserver log
Merge pull request #10 from zenoss/feature/ZEN-12776

ZEN-12776: More graceful logging from zope timeout in zeneventserver log
fixes ZEN-8978: added extensions 1000 to max to EventDetailSet