[Opengeoscience-developers] OpenGeoscience branch, next, updated. 755e873ff89e8c0e84f856529c85fe3ba67d39f2
Aashish Chaudhary
aashish.chaudhary at kitware.com
Thu Aug 22 11:59:24 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".
The branch, next has been updated
via 755e873ff89e8c0e84f856529c85fe3ba67d39f2 (commit)
via 0d34472bf79ee7666f3f25fc545375d8184fb234 (commit)
via e1998e5672645e27bf557f0e28c9759eeb56aedd (commit)
via 162eaebe0d97983965bac13ec2ba899e7a8f0831 (commit)
via 64c39b9639aaaa400b935ed52207a7b6866736f8 (commit)
via cf680cca09acbea3a24f1454308999b3a2b30d53 (commit)
via 8ca2c6b8cbda1629e7d8be2b4b54520976dcf0f3 (commit)
via 5e591003c661ca550dd42e2bdd185c8f34a691b0 (commit)
via 18ce0310eb53bbe437bd53166ff688fe1ce9246e (commit)
via 244b2ec22aec51b7a48c4a4fd8921e2ecca5b668 (commit)
via 7e813661c2660b6d827d6edebcd00ec57a47149e (commit)
via 8b71fbae1ca132d5f5dc132fd00f1252d58cf514 (commit)
via 0667845e9d8ff6bc1baa71e806b842041f569422 (commit)
from ddd3fed61ed5343ccc21898425695cec63662641 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=755e873ff89e8c0e84f856529c85fe3ba67d39f2
commit 755e873ff89e8c0e84f856529c85fe3ba67d39f2
Merge: ddd3fed 0d34472
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Thu Aug 22 11:59:04 2013 -0400
Merge remote-tracking branch 'origin/runtime_import' into next
* origin/runtime_import:
Time fixes
Fixed various issues with logic and style
Initial work on run time import
Relocated import script
Reorganized import script to import on file basis
keep start date around too for completeness
record enough time info to compare datasets
put array ranges over all time into database
Conflicts:
web/lib/geoweb.min.js
modules/mongoimp.py | 205 +++++++++++++++++++++++++++++++++++++++++++++++
modules/reader.py | 33 ++++++--
modules/standardtime.py | 10 +-
modules/vtk_reader.py | 6 +-
scripts/mongoimp.py | 108 -------------------------
5 files changed, 239 insertions(+), 123 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
modules/mongoimp.py | 205 +++++++++++++++++++++++++++++++++++++++++++++++
modules/reader.py | 33 ++++++--
modules/standardtime.py | 10 +-
modules/vtk_reader.py | 6 +-
scripts/mongoimp.py | 108 -------------------------
5 files changed, 239 insertions(+), 123 deletions(-)
create mode 100755 modules/mongoimp.py
delete mode 100755 scripts/mongoimp.py
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list