You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/09/02 19:09:01 UTC

[7/7] git commit: Merge and close PR #140

Merge and close PR #140


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c1ab0be5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c1ab0be5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c1ab0be5

Branch: refs/heads/master
Commit: c1ab0be586830d20855069ff488f921bc7d4a230
Parents: b4e649d b17c5aa
Author: Richard Downer <ri...@apache.org>
Authored: Tue Sep 2 18:08:21 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Sep 2 18:08:21 2014 +0100

----------------------------------------------------------------------
 core/pom.xml                                    |    45 +-
 .../GeoIPJava-1.2.8/ASNumLookupTest.java        |    39 -
 .../GeoIPJava-1.2.8/ASNumLookupTestV6.java      |    39 -
 .../maxmind/GeoIPJava-1.2.8/BenchmarkGeoIP.java |    97 -
 core/src/3rd/maxmind/GeoIPJava-1.2.8/Changes    |   121 -
 .../maxmind/GeoIPJava-1.2.8/CityLookupTest.java |    54 -
 .../GeoIPJava-1.2.8/CityLookupTestV6.java       |    54 -
 .../GeoIPJava-1.2.8/CountryLookupTest.java      |    57 -
 .../GeoIPJava-1.2.8/CountryLookupTestV6.java    |    56 -
 .../GeoIPJava-1.2.8/DistributedServiceTest.java |    45 -
 core/src/3rd/maxmind/GeoIPJava-1.2.8/LICENSE    |   504 -
 .../GeoIPJava-1.2.8/NetSpeedCellLookupTest.java |    39 -
 .../GeoIPJava-1.2.8/NetspeedLookupTest.java     |    50 -
 .../maxmind/GeoIPJava-1.2.8/OrgLookupTest.java  |    42 -
 core/src/3rd/maxmind/GeoIPJava-1.2.8/README     |    77 -
 .../GeoIPJava-1.2.8/RegionLookupTest.java       |    41 -
 .../admin/generate_regionName.pl                |   113 -
 .../GeoIPJava-1.2.8/admin/generate_timeZone.pl  |    66 -
 .../admin/new_generate_TimeZone.pl              |   110 -
 .../source/com/maxmind/geoip/Country.java       |    61 -
 .../source/com/maxmind/geoip/DatabaseInfo.java  |   127 -
 .../source/com/maxmind/geoip/Location.java      |    60 -
 .../source/com/maxmind/geoip/LookupService.java |  1204 --
 .../source/com/maxmind/geoip/Region.java        |     8 -
 .../source/com/maxmind/geoip/regionName.java    | 12782 -----------------
 .../source/com/maxmind/geoip/timeZone.java      |  1459 --
 .../java/brooklyn/location/geo/HostGeoInfo.java |     3 +-
 .../location/geo/MaxMindHostGeoLookup.java      |    94 -
 .../geo/HostGeoLookupIntegrationTest.java       |    18 -
 .../geoscaling/GeoscalingIntegrationTest.java   |     4 +-
 30 files changed, 15 insertions(+), 17454 deletions(-)
----------------------------------------------------------------------