Created
April 18, 2012 15:58
-
-
Save kenton/2414523 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(@ondemand)(1m|feature/ondemand-geogrid!?) ~limos $ git pull origin feature/ondemand-geogrid | |
From ldc.beanstalkapp.com:/ldc-git | |
* branch feature/ondemand-geogrid -> FETCH_HEAD | |
Auto-merging lib/ondemand/pricing/geographic_shapes/disambiguation.rb | |
Auto-merging lib/ondemand/pricing/TESTING.txt | |
Merge made by the 'recursive' strategy. | |
app/models/geographic_shape.rb | 3 ++- | |
lib/ondemand/pricing/TESTING.txt | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
lib/ondemand/pricing/geographic_generator/market_geometries.rb | 9 +++++++- | |
lib/ondemand/pricing/geographic_shapes/database_installer.rb | 6 ++++- | |
lib/ondemand/pricing/geographic_shapes/{airport_city_regional_disambiguation.rb => disambiguation.rb} | 2 +- | |
lib/ondemand/pricing/geographic_shapes/lazy_grid_lookup.rb | 22 ++++++++++++++----- | |
lib/ondemand/pricing/grid/enhanced_polygon.rb | 2 +- | |
lib/ondemand/pricing/grid/geo_helpers.rb | 4 ++-- | |
lib/ondemand/pricing/grid/virtual_grid.rb | 1 + | |
lib/ondemand/pricing/routes/lazy_route_lookup.rb | 15 +++++++------ | |
lib/ondemand/pricing/routes/route_database_installer.rb | 13 +++++++---- |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment