[jnr-netdb] 01/02: Merge tag 'upstream/1.1.4'

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository jnr-netdb.

commit 5084c4fc2806cf42a6352cbfb369f249b9ea6b3a
Merge: 3ba487f 49fc6c6
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Feb 11 23:12:32 2015 -0300

    Merge tag 'upstream/1.1.4'
    
    Upstream release 1.1.4

 .gitignore                                         |   2 +
 .travis.yml                                        |   4 +
 pom.xml                                            |  90 +++-----
 src/jnr/netdb/NativeProtocolsDB.java               | 141 ------------
 src/jnr/netdb/NativeServicesDB.java                | 155 -------------
 src/{ => main/java}/jnr/netdb/FileProtocolsDB.java |   6 +-
 src/{ => main/java}/jnr/netdb/FileServicesDB.java  |   0
 src/{ => main/java}/jnr/netdb/IANAProtocolsDB.java |   0
 src/{ => main/java}/jnr/netdb/IANAServicesDB.java  |   0
 src/main/java/jnr/netdb/NativeProtocolsDB.java     | 211 +++++++++++++++++
 src/main/java/jnr/netdb/NativeServicesDB.java      | 251 +++++++++++++++++++++
 src/{ => main/java}/jnr/netdb/NetDBEntry.java      |   0
 src/{ => main/java}/jnr/netdb/NetDBFilter.java     |   0
 src/{ => main/java}/jnr/netdb/NetDBIterator.java   |   0
 src/{ => main/java}/jnr/netdb/NetDBParser.java     |   0
 src/{ => main/java}/jnr/netdb/Protocol.java        |   0
 src/{ => main/java}/jnr/netdb/ProtocolsDB.java     |   0
 src/{ => main/java}/jnr/netdb/Service.java         |   0
 src/{ => main/java}/jnr/netdb/ServicesDB.java      |   0
 src/{ => main/java}/jnr/netdb/StringUtil.java      |  17 +-
 .../test/java}/jnr/netdb/FileProtocolDBTest.java   |   0
 .../test/java}/jnr/netdb/FileServicesDBTest.java   |   0
 .../java}/jnr/netdb/NativeProtocolsDBTest.java     |   0
 .../test/java}/jnr/netdb/NativeServicesDBTest.java |   6 +-
 .../test/java}/jnr/netdb/ProtocolTest.java         |   0
 {test => src/test/java}/jnr/netdb/ServiceTest.java |   0
 26 files changed, 512 insertions(+), 371 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnr-netdb.git