[rubygem-stomp/epel7: 2/2] Merge branch 'master' into epel7

[stevetraylen]

commit c6ba470f4537c94fedd618ca7e55f2b11500af0d
Merge: 9f713b9 b099708
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Mar 23 14:09:21 2015 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	rubygem-stomp.spec

 rubygem-stomp.spec | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
---
diff --cc rubygem-stomp.spec
index 02dbe69,fbfee1a..90ef034
--- a/rubygem-stomp.spec
+++ b/rubygem-stomp.spec
@@@ -132,7 -130,12 +130,10 @@@ pop
  %doc %{gem_instdir}/test/test_urlogin.rb
  %doc %{gem_instdir}/test/tlogger.rb
  
 -
 -
  %changelog
+ * Wed Mar 11 2015 Steve Traylen  <steve.traylen at cern.ch> - 1.3.4-2
+ - Force rspec 2 tests.
+ 
  * Wed Mar 11 2015 Steve Traylen  <steve.traylen at cern.ch> - 1.3.4-1
  - Upstream 1.3.4 release