Merge branch 'master' of git://github.com/ironruby/ironruby

Conflicts:
	Merlin/Main/Languages/Ruby/Ruby/Builtins/RubyClass.cs

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/argf/getc_tags.txt

@@ -1,2 +1,2 @@
-fails:ARGF.getc reads each char of files
-fails:ARGF.getc returns nil when end of stream reached
+critical:ARGF.getc reads each char of files
+critical:ARGF.getc returns nil when end of stream reached

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/thread/alive_tags.txt

@@ -1 +1,2 @@
 fails:Thread#alive? reports aborting on a killed thread
+thread:Thread#alive? describes a dying sleeping thread

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/thread/kill_tags.txt

@@ -1 +1,4 @@
 fails:Thread#kill can be rescued by outer rescue clause when inner ensure clause raises exception
+thread:Thread#kill killing dying sleeping thread wakes up thread
+thread:Thread#kill is deferred if ensure clause does Thread.stop
+thread:Thread#kill does not deadlock when called from within the thread while being joined from without

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/thread/run_tags.txt

@@ -0,0 +1 @@
+thread:Thread#run does not result in a deadlock

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/thread/status_tags.txt

@@ -1 +1,3 @@
 fails:Thread#status reports aborting on a killed thread
+thread:Thread#status describes a dying sleeping thread
+thread:Thread#status reports aborting on a killed thread

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/thread/stop_tags.txt

@@ -1 +1,3 @@
-fails:Thread#stop? reports aborting on a killed thread
+critical:Thread#stop? reports aborting on a killed thread
+thread:Thread#stop? describes a dying sleeping thread
+thread:Thread.stop causes the current thread to sleep indefinitely

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/thread/terminate_tags.txt

@@ -1 +1,5 @@
 fails:Thread#terminate can be rescued by outer rescue clause when inner ensure clause raises exception
+thread:Thread#terminate killing dying sleeping thread wakes up thread
+thread:Thread#terminate is deferred if ensure clause does Thread.stop
+thread:Thread#terminate does not deadlock when called from within the thread
+while being joined from without

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/thread/wakeup_tags.txt

@@ -0,0 +1 @@
+thread:Thread#wakeup does not result in a deadlock

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/critical_tags.txt

@@ -1,11 +1,11 @@
-<<<<<<< HEAD:Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/critical_tags.txt
 core\argf\close_tags.txt:0:critical:ARGF.close reads one line from the first file, closes it and read the next one
 core\argf\eof_tags.txt:0:critical:ARGF.eof? returns true when reaching the end of a file
 core\argf\eof_tags.txt:0:critical:ARGF.eof returns true when reaching the end of a file
 core\argf\file_tags.txt:0:critical:ARGF.file returns the current file object on each file
 core\argf\filename_tags.txt:0:critical:ARGF.filename returns the current file name on each file 
 core\argf\filename_tags.txt:0:critical:ARGF.filename it sets the $FILENAME global variable with the current file name on each file
 core\argf\fileno_tags.txt:0:critical:ARGF.fileno returns the current file number on each file
+core\argf\gets_tags.txt:0:critical:ARGF.gets
 core\argf\gets_tags.txt:0:critical:ARGF.gets reads one line of a file
 core\argf\gets_tags.txt:0:critical:ARGF.gets reads all lines of a file
 core\argf\gets_tags.txt:0:critical:ARGF.gets reads all lines of two files
@@ -17,8 +17,18 @@ core\argf\path_tags.txt:0:critical:ARGF.path it sets the $FILENAME global variab
 core\argf\rewind_tags.txt:0:critical:ARGF.rewind goes back to beginning of current file
 core\argf\to_i_tags.txt:0:critical:ARGF.to_i returns the current file number on each file
 core\argf\to_io_tags.txt:0:critical:ARGF.to_io returns the IO of the current file
+core\array\comparison_tags.txt:0:critical:Array#<=> properly handles recursive arrays
+core\array\eql_tags.txt:0:critical:Array#eql? properly handles recursive arrays
+core\array\equal_value_tags.txt:0:critical:Array#== properly handles recursive arrays
+core\array\hash_tags.txt:0:critical:Array#hash properly handles recursive arrays
+core\array\hash_tags.txt:0:critical:Array#hash properly handles recursive arrays
+core\array\intersection_tags.txt:0:critical:Array#& properly handles recursive arrays
 core\array\join_tags.txt:0:critical:Array#join raises a NoMethodError if an element does not respond to #to_s 
 core\array\join_tags.txt:0:critical:Array#join does not separates elements when the passed separator is nil
+core\array\multiply_tags.txt:0:critical:Array#* raises a NoMethodError if an element does not respond to #to_s
+core\array\union_tags.txt:0:critical:Array#| properly handles recursive arrays
+core\array\uniq_tags.txt:0:critical:Array#uniq properly handles recursive arrays
+core\array\uniq_tags.txt:0:critical:Array#uniq! properly handles recursive arrays
 core\kernel\sleep_tags.txt:3:critical:Kernel#sleep pauses execution indefinitely if not given a duration
 core\process\times_tags.txt:0:unstable:Process.times returns current cpu times
 core\string\process\wait_tags.txt:0:critical:Process.wait
@@ -29,24 +39,10 @@ core\string\hex_tags.txt:3:critical:String#hex takes an optional sign
 core\string\hex_tags.txt:3:critical:String#hex returns 0 on error
 core\string\oct_tags.txt:3:critical:String#oct takes an optional sign
 core\string\oct_tags.txt:3:critical:String#oct returns 0 on error
-core\thread\critical_tags.txt:0:unstable:Thread.critical= does not change status of other existing threads
-=======
-core\argf\gets_tags.txt:0:critical:ARGF.gets
-core\array\comparison_tags.txt:0:critical:Array#<=> properly handles recursive arrays
-core\array\eql_tags.txt:0:critical:Array#eql? properly handles recursive arrays
-core\array\equal_value_tags.txt:0:critical:Array#== properly handles recursive arrays
-core\array\hash_tags.txt:0:critical:Array#hash properly handles recursive arrays
-core\array\hash_tags.txt:0:critical:Array#hash properly handles recursive arrays
-core\array\intersection_tags.txt:0:critical:Array#& properly handles recursive arrays
-core\array\join_tags.txt:0:critical:Array#join raises a NoMethodError if an element does not respond to #to_s 
-core\array\multiply_tags.txt:0:critical:Array#* raises a NoMethodError if an element does not respond to #to_s
-core\array\union_tags.txt:0:critical:Array#| properly handles recursive arrays
-core\array\uniq_tags.txt:0:critical:Array#uniq properly handles recursive arrays
-core\array\uniq_tags.txt:0:critical:Array#uniq! properly handles recursive arrays
->>>>>>> d176ec1d4e6d546420e6645554b75c3f94d8e475:Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/critical_tags.txt
 core\thread\critical_tags.txt:0:critical:Thread.critical= defers exit until Thread.pass
 core\thread\critical_tags.txt:0:critical:Thread.critical= can be mismatched
 core\thread\raise_tags.txt:0:critical:Thread#raise on another thread re-raises active exception
+core\thread\critical_tags.txt:0:unstable:Thread.critical= does not change status of other existing threads
 language\method_tags.txt:0:critical:Calling a method fails with both lambda and block argument
 library\net\ftp\get_tags.txt:0:critical:Net::FTP#get (binary mode)
 library\net\ftp\getbinaryfile_tags.txt:0:critical:Net::FTP#getbinaryfile

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/library/net/ftp/put_tags.txt

@@ -1 +1,6 @@
 fails:Net::FTP#put (binary mode) sends the contents of the passed local_file, without modifications
+fails:Net::FTP#put (binary mode) sends the STOR command to the server
+fails:Net::FTP#put (binary mode) returns nil
+fails:Net::FTP#put (text mode) sends the STOR command to the server
+fails:Net::FTP#put (text mode) sends the contents of the passed local_file, using
+fails:Net::FTP#put (text mode) returns nil

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/library/net/ftp/putbinaryfile_tags.txt

@@ -1 +1,3 @@
 fails:Net::FTP#putbinaryfile sends the contents of the passed local_file, without modifications
+fails:Net::FTP#putbinaryfile sends the STOR command to the server
+fails:Net::FTP#putbinaryfile returns nil

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/library/net/ftp/storbinary_tags.txt

@@ -1 +1,2 @@
 fails:Net::FTP#storbinary yields the transmitted content as binary blocks of the passed size
+fails:Net::FTP#storbinary sends the passed command and the passed File object's content to the server

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/library/rexml/document/write_tags.txt

@@ -1 +1,2 @@
+fails:REXML::Document#write returns document indented
 fails:REXML::Document#write returns document with transitive support

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/library/net/http/http/fixtures/http_server.rb

@@ -51,7 +51,7 @@ def do_GET(req, res)
   class << self
     def start_server
       server_config = {
-        :BindAddress => "0.0.0.0",
+        :BindAddress => "127.0.0.1",
         :Port => 3333,
         :Logger => WEBrick::Log.new(NullWriter.new),
         :AccessLog => [],
@@ -77,4 +77,4 @@ def stop_server
       Thread.pass until @server.status == :Stop
     end
   end
-end
+end

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/library/zlib/gzipfile/orig_name_spec.rb

@@ -8,6 +8,10 @@
 	@gzip_writer = Zlib::GzipWriter.new @io
   end
 
+  before :all do
+    GC.disable
+  end
+
   it 'is nil by default' do
     @gzip_writer.orig_name.should be_nil
   end

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/library/zlib/gzipwriter/write_spec.rb

@@ -10,6 +10,10 @@
     @io = StringIO.new
   end
 
+  before :all do
+    GC.disable
+  end
+
   it "writes compressed data that can be uncompressed" do
     Zlib::GzipWriter.wrap @io do |gzio|
       gzio.write @data