Merge branch 'master' into instrument-network-calls

mtodd · mtodd · commit 8098c5fb499f · 2014-08-31T00:55:09.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,4 +4,7 @@ rvm:
   - 2.0.0
   - jruby-19mode
   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
 script: bundle exec rake spec
diff --git a/README.rdoc b/README.rdoc
@@ -1,4 +1,4 @@
-= Net::LDAP for Ruby {<img src="https://travis-ci.org/ruby-ldap/ruby-net-ldap.png" />}[https://travis-ci.org/ruby-ldap/ruby-net-ldap]
+= Net::LDAP for Ruby {<img src="https://travis-ci.org/github/ruby-net-ldap.png" />}[https://travis-ci.org/github/ruby-net-ldap]
 
 == Description
 
diff --git a/lib/net/ldap/version.rb b/lib/net/ldap/version.rb
@@ -1,5 +1,5 @@
 module Net
   class LDAP
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= Net::LDAP for Ruby {<img src="https://travis-ci.org/ruby-ldap/ruby-net-ldap.png" />}[https://travis-ci.org/ruby-ldap/ruby-net-ldap]`
	`1`	`+= Net::LDAP for Ruby {<img src="https://travis-ci.org/github/ruby-net-ldap.png" />}[https://travis-ci.org/github/ruby-net-ldap]`
`2`	`2`
`3`	`3`	`== Description`
`4`	`4`