Steve Harris
3230e0b246
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 3a9d4961e234cbde4124
2012-08-30 14:40:34 -05:00
Steve Harris
a14374fcd4
12.9.1-11 baseline
...
Former-commit-id: 6eb6b0909bfc405efab7
2012-08-30 14:36:12 -05:00
Steve Harris
dc08c5a71a
12.9.1-10 baseline
...
Former-commit-id: 3adc50a783cb9b80f3a0
2012-08-30 14:28:27 -05:00
Steve Harris
87a602dfee
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 91e39617cba71dac6cad
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
a09fa0b649
Issue #1006 Implemented urban areas. Cherry picked from development on SS builds
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8
Former-commit-id: 1b45f1b6d9f646b185da
2012-08-23 09:27:46 -05:00
Richard Peter
252e8e7e2e
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 6c1690e0634c56f4e20d
2012-08-22 17:07:17 -05:00
Steve Harris
b2c0dd1abb
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b8ab6066f6b77a4d40d7
2012-08-22 16:00:33 -05:00
James Korman
654ecefd3e
Issue #798 - Correct for hdfFileId
...
Former-commit-id: 56d6b1e886c2c228b429
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
c7bc786a60
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: a501aacb3ba5c57e8d24
2012-08-22 13:03:24 -05:00
Steve Harris
9565d18b96
Issue #915 Set the user data. (cherry picked from development_on_ss_builds)
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Former-commit-id: 8e3ecc1efdb8629a0f20
2012-08-22 13:01:08 -05:00
Steve Harris
77369f78a6
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: d38f8b80f044a7cb75e7
2012-08-21 16:17:58 -05:00
Steve Harris
72824561cb
12.9.1-5 baseline
...
Former-commit-id: 61f269f54cf2fac39428
2012-08-21 15:27:03 -05:00
Ron Anderson
d3693827a1
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: d7a818fd1d7662d249ab
2012-08-17 12:41:49 -05:00
Ron Anderson
6eafdda705
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 1321db6a99819b9c8e56
2012-08-17 12:20:08 -05:00
root
b3217ad886
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 342bda7e5f6eec24180e
2012-08-15 22:29:38 +00:00
root
3e9d1fa430
Merge branch 'reconcile' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
Former-commit-id: b93989daafba40e18fb2
2012-08-15 22:29:07 +00:00
root
8a66b2f209
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f578795a453ee984
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
91493ee0b9
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 72c63e1a6f7bad34f906
2012-08-15 16:22:39 -05:00
Steve Harris
9990bf909b
12.9.1-4 baseline
...
Former-commit-id: dcda3a229033b95fb96d
2012-08-15 15:19:10 -05:00
Steve Harris
edbbacfa8a
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f6084bbf2573e
2012-08-15 14:26:10 -05:00
Steve Harris
448ed038c2
12.9.1-2 baseline
...
Former-commit-id: d1d877d319a198b3a807
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
e584d728f0
Issue #915 Set the user data.
...
Former-commit-id: 865136f6ef03ed8ee0b0
2012-08-15 14:05:50 -05:00
Steve Harris
0c5d9e2416
12.9.1-1 baseline
...
Former-commit-id: 31ae7ea21879ce6cfd97
2012-08-15 13:59:00 -05:00
Ron Anderson
7cde30681b
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 17f636c2a281abb2c60b
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
77b7c4c517
Issue #947 revert changes to dataTime format
...
Former-commit-id: 50cb7383a670ba8d82db
2012-08-14 16:20:36 -05:00
Ron Anderson
9bf0166f13
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 71d74b1dcf985167892d
2012-08-14 16:20:23 -05:00
Ben Steffensmeier
15977fdba2
Issue #947 revert changes to dataTime format
...
Former-commit-id: ce689ad5fa434193b34b
2012-08-14 16:12:02 -05:00
Ben Steffensmeier
c9ff69014b
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: c6a121962f1e527f83f0
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
4ed3d04e64
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 525c0b21a9b53fe917bc
2012-08-09 17:50:23 -05:00
Nate Jensen
2cc3c63ba7
Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
...
Former-commit-id: eeaa2c798f4211a8deac
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
65c33256d9
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 066a5af2a6ad1415948f
2012-08-09 17:16:38 -05:00
Nate Jensen
1214c05b72
Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
...
Former-commit-id: a88d7bcedcfbbf74eb50
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
b6cc71bf75
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 97ba96759c5da238c8b9
2012-08-08 14:41:33 -05:00
Steve Harris
0ef9f1c86e
Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
...
Former-commit-id: bbf4b18204d538fd8913
2012-08-08 13:57:46 -05:00
Steve Harris
15753699bd
Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
...
Former-commit-id: 926ff5dc5a9e2e0fa166
2012-08-07 15:29:25 -05:00
Steve Harris
9387e8b2d0
Fixed merge of development / 12.8.1-5 versions of HttpClient.java
...
Former-commit-id: 6dae0398d33f88fa9078
2012-08-07 10:04:39 -05:00
Steve Harris
62e9207ba7
Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: d90c5f989df3babcf1a1
2012-08-06 11:13:47 -05:00
Max Schenkelberg
482dfb4711
Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
...
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b
Former-commit-id: 36bf80d13e0031d21292
2012-08-06 09:44:44 -05:00
Steve Harris
b2432e096f
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
...
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: f0b7d5e4c585f82b18b3
2012-08-06 09:38:26 -05:00
Steve Harris
d5563fc340
12.8.1-10 baseline
...
Former-commit-id: b5e8fee24dca25d508ec
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
f26cce33a9
Issue #1006 Implemented urban areas.
...
Former-commit-id: dbd30e3b6762db15b6f4
2012-08-06 08:41:52 -05:00
Steve Harris
8f4ddad22c
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 24799cd93da1071e3204
2012-08-06 08:23:04 -05:00
Bryan Kowal
f295ee11ea
Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
...
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36
Former-commit-id: c6b2d653085ca4a66fdc
2012-08-02 10:33:55 -05:00
James Korman
241303f9a0
Issue #798 - Updates to satellite
...
Former-commit-id: 7928d912e12ddb2f6df0
2012-08-01 16:31:59 -05:00
Steve Harris
3476fe755b
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 6d77b9421751e38ca887
2012-08-01 12:43:12 -05:00
Max Schenkelberg
9f34d7a5f3
Issue #626 Fixed changes to GridDownscaler in SatelliteDao
...
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90
Former-commit-id: 2d36eb040dd89b58f7fd
2012-08-01 11:36:44 -05:00
Max Schenkelberg
74f0179b92
Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
...
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac
Former-commit-id: f635e9c332cc0a1fbca3
2012-08-01 10:51:32 -05:00
Steve Harris
e0c3722fd1
12.8.1-5 baseline
...
Former-commit-id: fd2abfb6f1cd49ef3eda
2012-08-01 10:45:37 -05:00
James Korman
15af4ada93
Issue #798 - Code review changes
...
Former-commit-id: 14e68406b439a32d7c91
2012-07-31 14:34:27 -05:00
James Korman
5df52e38f9
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 38a2e426d94cbbc59278
2012-07-31 13:38:23 -05:00
