[gofer/el6: 6/6] Merge branch 'master' into el6

[Jeff Ortel]

commit 039b640119bac43f2e8a765da09e5a82497d0a04
Merge: 7ab1d43 d79c6a5
Author: Jeff Ortel <jortel at redhat.com>
Date:   Fri Oct 5 15:50:25 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	gofer.spec
    	sources

 .gitignore |    1 +
 gofer.spec |   96 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
 sources    |    2 +-
 3 files changed, 82 insertions(+), 17 deletions(-)
---
diff --cc gofer.spec
index 86627b0,8f4d431..551acdb
--- a/gofer.spec
+++ b/gofer.spec
@@@ -242,6 -248,61 +248,64 @@@ This plug-in provides RMI access to pac
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Oct 03 2012 Jeff Ortel <jortel at redhat.com> 0.74-1
+ - Make watchdog journal object configurable; watchdog singleton by URL only.
+   (jortel at redhat.com)
+ 
+ * Thu Sep 13 2012 Jeff Ortel <jortel at redhat.com> 0.73-1
+ - Progress reporting enhancements. (jortel at redhat.com)
+ - Add for debugging w/o running as root. (jortel at redhat.com)
+ * Mon Aug 20 2012 Jeff Ortel <jortel at redhat.com> 0.72-1
+ - Add unit tests: watchdog test. (jortel at redhat.com)
+ - Add man page for goferd. (jortel at redhat.com)
+ - Replace BlackList with python set. (jortel at redhat.com)
+ - Add progress reporting; watchdog enhancements. (jortel at redhat.com)
+ - remove f15 and add f18 to tito releaser. (jortel at redhat.com)
+ 
+ * Tue Jul 31 2012 Jeff Ortel <jortel at redhat.com> 0.71-1
+ - Port ruby-gofer to rubygem-qpid. (jortel at redhat.com)
+ - Make /usr/share/gofer/plugins the primary plugin location. Based on fedora
+   packaging guidelines referencing FHS standards. (jortel at redhat.com)
+ - Discontinue {_libdir} macro for plugins. (jortel at redhat.com)
+ * Tue Jun 12 2012 Jeff Ortel <jortel at redhat.com> 0.70-1
+ - Refit mocks for reparent of Envelope & Options to (object).
+   (jortel at redhat.com)
+ 
+ * Fri Jun 08 2012 Jeff Ortel <jortel at redhat.com> 0.69-1
+ - 829767 - fix simplejons 2.2+ issue (fedora 17). Envelope/Options rebased on
+   object rather than dict. (jortel at redhat.com)
+ - Add whiteboard. (jortel at redhat.com)
+ - Fixed 'Undefined variable (s) in XBindings.__bindings(). (jortel at redhat.com)
+ 
+ * Thu Apr 26 2012 Jeff Ortel <jortel at redhat.com> 0.68-1
+ - Refit watchdog plugin; set journal location; skip directories in journal dir.
+   (jortel at redhat.com)
+ - Make the watchdog journal directory configurable. (jortel at redhat.com)
+ - Add Broker.touch() and rename Topic.binding(). (jortel at redhat.com)
+ - Better support for durable topic subscription.  Queue bindings to specified
+   exchanges. (jortel at redhat.com)
+ * Fri Mar 16 2012 Jeff Ortel <jortel at redhat.com> 0.67-1
+ - Add (trace) attribute to propagated exceptions. (jortel at redhat.com)
+ - Add traceback info to propagated exceptions as: Exception.trace.
+   (jortel at redhat.com)
+ - Add support for __getitem__ in container and stub. (jortel at redhat.com)
+ - Refactor to crypto (delegate) interface. (jortel at redhat.com)
+ - Support multiple security decorators. (jortel at redhat.com)
+ - perf: asynchronous ack(); tcp_nodelay. (jortel at redhat.com)
+ - Rename 'delayed/trigger' policy property to match option. (jortel at redhat.com)
+ - Rename 'delayed' option to: 'trigger'. (jortel at redhat.com)
+ - option 'delayed' implies asynchronous RMI. (jortel at redhat.com)
+ - fix for tito compat. (jortel at redhat.com)
+ - bridge: clean debug prints; make gateway a thread. (jortel at redhat.com)
+ - Add tcp bridge (experimental). (jortel at redhat.com)
+ - Add support for delayed trigger asynchronous RMI. (jortel at redhat.com)
+ - Add fedora releaser. (jortel at redhat.com)
+ - support setting producer uuid; HMAC enhancements. (jortel at redhat.com)
+ - rel-eng: rename redhat releaser. (jortel at redhat.com)
+ 
++>>>>>>> master
  * Tue Feb 21 2012 Jeff Ortel <jortel at redhat.com> 0.66-1
  - Add DistGit releaser. (jortel at redhat.com)
  - Add deps: python-iniparse; python-hashlib (rhel5). (jortel at redhat.com)