Merge oficial/master into trunk-AVRO-1723
Conflicts:
lang/java/avro/src/test/java/org/apache/avro/TestFixed.java
lang/ruby/lib/avro.rb
Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/64c482fd
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/64c482fd
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/64c482fd
Branch: refs/heads/master
Commit: 64c482fdeeaeac9d19511f9e4ea58447dbfcb91e
Parents: 874fff7 4b3677c
Author: Zoltan Farkas <[email protected]>
Authored: Thu Apr 6 13:46:24 2017 -0400
Committer: Zoltan Farkas <[email protected]>
Committed: Thu Apr 6 13:46:24 2017 -0400
----------------------------------------------------------------------
.gitignore | 1 +
.../test/java/org/apache/avro/TestFixed.java | 2 +-
lang/ruby/Manifest | 2 +
lang/ruby/lib/avro.rb | 1 +
lang/ruby/lib/avro/io.rb | 49 +-
lang/ruby/lib/avro/protocol.rb | 17 +-
lang/ruby/lib/avro/schema.rb | 60 ++-
lang/ruby/lib/avro/schema_compatibility.rb | 168 +++++++
lang/ruby/test/test_io.rb | 34 ++
lang/ruby/test/test_protocol.rb | 39 +-
lang/ruby/test/test_schema.rb | 132 ++++++
lang/ruby/test/test_schema_compatibility.rb | 463 +++++++++++++++++++
12 files changed, 895 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/avro/blob/64c482fd/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 6f884ed,d5b1b74..a9fa766
--- a/.gitignore
+++ b/.gitignore
@@@ -13,5 -13,3 +13,6 @@@ targe
/build
test-output
/dist
+/lang/java/compiler/nbactions.xml
+/lang/java/compiler/nb-configuration.xml
++/lang/java/compiler/nbproject/
