Roger Ferrel
a3dc020209
Issue #875 Added tri-state for Point fields movable and hidden.
...
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964
Former-commit-id: 65e92379594978b5305d70217e155665e92379594978b5305d70217e155666d98d068c70217e155666d98d068c9caf301ac18d21873f2f7bbcb004beed3663b14585cf1738ef
2012-09-17 09:02:26 -05:00
Ron Anderson
6de33bf4c7
Merge "Issue #1117 : Modify D2DGridDatabase to retrieve parms from GribParamInfo XML files, modify ParameterInfo to provide list of valid levels for each parameter, create utility script to convert A1 CDL to A2 XML format, modify WeatherElementBrowser so database lists are always current." into development
...
Former-commit-id: 5b13a48b8db628c604ad5c844b346c5b13a48b8db628c604ad5c844b346c2dc48d6a855c844b346c2dc48d6a85e786fbb969af643434d2558cfd51cb6dbf6c9c8114dd12d24a
2012-09-13 17:41:14 -05:00
Nate Jensen
5794d1a052
Merge "Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well." into development
...
Former-commit-id: 19bd82a901661ef694895e9ef6a22419bd82a901661ef694895e9ef6a2241af23445655e9ef6a2241af2344565bca649279a7c5c95807499a6312ae0c1d12f5b544a0294bd3d
2012-09-13 16:26:02 -05:00
David Gillingham
d10b8b964d
Issue #1117 : Modify D2DGridDatabase to retrieve parms from GribParamInfo
...
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.
Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5
Former-commit-id: 4d7f324f6403a202134a21739d1d384d7f324f6403a202134a21739d1d3899ab0a124b21739d1d3899ab0a124ba048dee4b328ade875c5964927b19d527a457e55dcc5c7789d
2012-09-13 15:39:58 -05:00
Steve Harris
428026fb7c
Merge branch 'ss_builds' into Unified_Grid
...
Former-commit-id: 2804af0e56b53075f288206e25cbd42804af0e56b53075f288206e25cbd4a821755cf3206e25cbd4a821755cf384b893fd39107ae124573a923433e6cbae0bdbba674c12c0c4
2012-09-13 15:26:38 -05:00
Steve Harris
01248e7101
Merge branch 'development' into Enhanced_points
...
Former-commit-id: b84b354c012e47ad78bc321e2191b1b84b354c012e47ad78bc321e2191b16146f56ce4321e2191b16146f56ce492bac7167abc86013d8f9ca736f90169b627265840ddaa276f
2012-09-13 15:25:12 -05:00
Steve Harris
de8ec1b459
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 2a425034139ae530cd1babc2a7fb622a425034139ae530cd1babc2a7fb62da0afec2c1abc2a7fb62da0afec2c165fc6b85b0f4ed20ec4edcae36f2d7e860b1ea6d42f2977019
2012-09-13 15:21:40 -05:00
Max Schenkelberg
3d478f934f
Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well.
...
Change-Id: I4756cffb310ba9c7eab707b3764f667db01f886f
Former-commit-id: 587b5bacc03cdabeb7cd5a9d7eea35587b5bacc03cdabeb7cd5a9d7eea35932e4da3a95a9d7eea35932e4da3a938c1f1bb5278348fd355e6ca7b11223962f6b1562caf54f9d3
2012-09-13 14:37:20 -05:00
Steve Harris
12c59e82df
Merge branch 'ss_builds' (12.10.1-4) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: bedc9569ca04de1d585729e7427dc3bedc9569ca04de1d585729e7427dc304d9735c8f29e7427dc304d9735c8f9d1f595fe6e23b030dfd53673f63e6f80fb6283730b0700044
2012-09-13 13:26:13 -05:00
Steve Harris
ed04125cd7
12.10.1-4 baseline
...
Former-commit-id: 0d8d18d7e2e38e81ab8cfd19ca56240d8d18d7e2e38e81ab8cfd19ca562449c3861597fd19ca562449c3861597424c32bd5d684feb34e52ba58a357626b7d083ece57e7237a9
2012-09-13 12:08:11 -05:00
James Korman
42a67b10de
Issue #1011 - Corrected AIREP turbulence decoding
...
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1
Former-commit-id: 972d96fe336531df3ab0c0e5570aa2972d96fe336531df3ab0c0e5570aa2d3fd8a53dfc0e5570aa2d3fd8a53dfa5bc971db42241841dcd029f9537c8a58854cd36be6c142d24
2012-09-13 10:18:39 -05:00
Brad Gonzales
314039d80b
Issue #951 added Appender EnvConfigurableRollingFileAppender.
...
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b
Former-commit-id: b384c8372b32df3284344b383c3274b384c8372b32df3284344b383c3274d10cabc9174b383c3274d10cabc91705314b86772ea400570441dc92ba3ab9937ef456f4e27386cd
2012-09-13 07:50:56 -05:00
Steve Harris
5b45d94813
Merge branch 'development' into Enhanced_points
...
Former-commit-id: bb6fe85a47892598dc661dd1305a5dbb6fe85a47892598dc661dd1305a5dada10668311dd1305a5dada10668310f90ce8b04e0ee6bbf96d85659d9ded20a1de86173b1005512
2012-09-12 14:14:56 -05:00
Richard Peter
e341a8c949
Merge "Issue #189 initial checkin of parameter plugin Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a" into Unified_Grid
...
Former-commit-id: 9bdafe3e908c6a9c67192c39f2e5849bdafe3e908c6a9c67192c39f2e58454b7b9ed092c39f2e58454b7b9ed0937f43c90d041eb2f3d9a7f93237af008866f042648f67e89de
2012-09-12 11:45:08 -05:00
Max Schenkelberg
1d31564f30
Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
...
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb
Former-commit-id: 863ecb1ad6e1b01588d1eabc8d684b863ecb1ad6e1b01588d1eabc8d684bcc37173be9eabc8d684bcc37173be9c8d7d72fcb69ba6f1ce1ec9b3c56fb411a8d43a0fca4448458
2012-09-12 09:22:25 -05:00
Richard Peter
fe8d1b40f7
Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
...
Former-commit-id: 5baaa6593fc8443cf85c701960a2465baaa6593fc8443cf85c701960a24660b21393fc701960a24660b21393fcf1d458e4509d1413ff28b5d3a41fb1c142137798457cb5375e
2012-09-12 08:27:11 -05:00
Steve Harris
24dde5731f
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: eff949899dd39a318583503cddcc5eeff949899dd39a318583503cddcc5eadf25aa707503cddcc5eadf25aa7071ce86f79cb31c1998d08865fd2f475dbd228eea22d3fdd9558
2012-09-11 17:06:26 -05:00
Steve Harris
e78abbb503
Merge branch 'ss_builds' (12.10.1-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
cave/com.raytheon.uf.viz.kml.export.feature/build.properties
cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment
Former-commit-id: 2f57e328fef94db138cd64d4e2bded2f57e328fef94db138cd64d4e2bded012c52681664d4e2bded012c526816047003d8c0b14d30591b41c82361f7bba73380ca3bec22460f
2012-09-11 16:57:03 -05:00
Steve Harris
9d4e230e7a
12.10.1-3 baseline
...
Former-commit-id: 0403e7d0a9de1639aea221f430062b0403e7d0a9de1639aea221f430062b969e7e6dfd21f430062b969e7e6dfd64699fa90bf376a4b4db438d139fddfaadb515295030894212
2012-09-11 16:00:38 -05:00
Steve Harris
4ccea19158
12.10.1-2 baseline
...
Former-commit-id: bb190a66a1dde1f4c54d250f0ccac9bb190a66a1dde1f4c54d250f0ccac9a66f3f4b60250f0ccac9a66f3f4b60406bde9fd0ec74f638e534d2ddee9dcc3c3dadee5684a84a46
2012-09-11 15:50:57 -05:00
Max Schenkelberg
5ecd46d9f5
Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions.
...
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546
Former-commit-id: b5a198a27dab120dfec6fffe220e05b5a198a27dab120dfec6fffe220e05c4398c09a4fffe220e05c4398c09a4197e66e51f7d5c82ebfda513b5830a6c5d3637e13a0d62686a
2012-09-11 14:04:14 -05:00
Lee Venable
983d22939a
Merge "Issue #1161 changed comparator" into development
...
Former-commit-id: 1a5f514d00f731ae885c802b43036e1a5f514d00f731ae885c802b43036ea691386102802b43036ea69138610278a6ccd095a5dde0e55d9f1f054f4caa256d89e59ab6370e0d
2012-09-11 10:02:21 -05:00
Dave Hladky
d99b1580a0
Issue #1161 changed comparator
...
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962
Former-commit-id: 70ccfe678aafb00feb6dc78fb26fbf70ccfe678aafb00feb6dc78fb26fbfaf27b562d7c78fb26fbfaf27b562d7ddd93c8f13e30f36206f1c1ffc77936c4495a7e647c4004123
2012-09-11 09:39:43 -05:00
Lee Venable
3835e1f717
Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
...
Former-commit-id: c1d6d8e77a1f86d2c4ba056e74d3cfc1d6d8e77a1f86d2c4ba056e74d3cf83fc018f38056e74d3cf83fc018f38b921d8300c782593a1181d0bdbd25c83c441319e4d0edf403e
2012-09-11 09:15:47 -05:00
Dave Hladky
b1ad95f547
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
...
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 7ea265580533f222783d28912552fe7ea265580533f222783d28912552fe6818408d4028912552fe6818408d40566007c43802b00ddf47655939bba78f3447ff9b2114682424
2012-09-11 08:56:51 -05:00
Ben Steffensmeier
646f703c1e
Issue #189 initial checkin of parameter plugin
...
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a
Former-commit-id: 4841cf13730bfedb4e54b3ead4e1694841cf13730bfedb4e54b3ead4e169a563707ad5b3ead4e169a563707ad5473fd64d85a039d55916e3b5a5effc0b29bd7562e4746820f6
2012-09-10 14:24:32 -05:00
Max Schenkelberg
376809e2b4
Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
...
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536
Former-commit-id: f7abe9ee396d78afd42380439b309bf7abe9ee396d78afd42380439b309b84658dd03a80439b309b84658dd03a827ef7301bd2d74fac2020f5d966db264bc403d629ab00a4cb
2012-09-10 10:45:37 -05:00
David Gillingham
573eecfc85
Issue #1150 : Fix regression caused by previous text product generation changes by ensuring all
...
directories get created.
Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0
Former-commit-id: fc39f37437cff73c9e1df192c8d115fc39f37437cff73c9e1df192c8d11583681d1ff6f192c8d11583681d1ff675daa050de64bf7f06139d13d3244d7bb5d95ac50497ffc0d8
2012-09-07 12:29:36 -05:00
Bryan Kowal
7ac0182778
Issue #1134 - edex will now use the same jep library that CAVE does
...
Former-commit-id: f3a273027c3c63f21cfcec89c440fef3a273027c3c63f21cfcec89c440fe04b574f56eec89c440fe04b574f56e0b7709663c8a0402949884f7083b816f159f35dec497827083
2012-09-07 10:28:51 -05:00
Steve Harris
46d05b60a1
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: 319927240c0e046d847abba4eb12d0319927240c0e046d847abba4eb12d0af106f1d29bba4eb12d0af106f1d2920e088a957f224e3e8ad53e29f59e4e9582cb789f8e7459dfb
2012-09-04 12:11:03 -05:00
Steve Harris
bc97cf788a
12.10.1-1 baseline
...
Former-commit-id: 7248f8b7620abf64b77c195158c0047248f8b7620abf64b77c195158c004d708932029195158c004d7089320299f4fa7bf83e720b8ed317bd9c63dc7d65f35ffe9a924a8347a
2012-09-04 12:07:27 -05:00
Steve Harris
623ef12926
Merge branch 'development' into Enhanced_points
...
Former-commit-id: feccb1205dfa7c31206b5feac55dbdfeccb1205dfa7c31206b5feac55dbd32cf7fd7645feac55dbd32cf7fd764ff1a0c911d5a8e58eda5592ab923bb66ac1051bc7c1cebf5b1
2012-08-30 15:43:06 -05:00
Steve Harris
e4a69a14b7
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 9ff4f369a4f52c8b374d3a9d4961e29ff4f369a4f52c8b374d3a9d4961e234cbde41243a9d4961e234cbde4124a3a1864f56ffe253196a3230e0b2465b4ee818b7b63855f152
2012-08-30 14:40:34 -05:00
Steve Harris
aec9addbfc
12.9.1-11 baseline
...
Former-commit-id: a2bb1dabe0d07c18918d6eb6b0909ba2bb1dabe0d07c18918d6eb6b0909bfc405efab76eb6b0909bfc405efab7503b7bf15cdc5ec3d16da14374fcd4f401755cde982804ee0e
2012-08-30 14:36:12 -05:00
Steve Harris
cba4faf995
12.9.1-10 baseline
...
Former-commit-id: 264d870cbfbdb45cdfae3adc50a783264d870cbfbdb45cdfae3adc50a783cb9b80f3a03adc50a783cb9b80f3a0c704490769f43a5af47fdc08c5a71a5bb474d33cede38c4b3f
2012-08-30 14:28:27 -05:00
Steve Harris
7f13d82b95
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: 772c4359da51eb89eb2a91e39617cb772c4359da51eb89eb2a91e39617cba71dac6cad91e39617cba71dac6cadfd6e8d5b63dbcb28ce7787a602dfee0b647c0c9d3f44e46a6f
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
b0a7548f0f
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: caaa78a98120c65a46771b45f1b6d9caaa78a98120c65a46771b45f1b6d9f646b185da1b45f1b6d9f646b185da137c2871adda1f3fe29ba09fa0b649acf62bb8d9e1a3c762b7
2012-08-23 09:27:46 -05:00
Richard Peter
4a9753cdc3
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: f9878c21f70dd2c44c9c6c1690e063f9878c21f70dd2c44c9c6c1690e0634c56f4e20d6c1690e0634c56f4e20df8c069352b46cd0f5110252e8e7e2e4a1c27bd2250ea44a1d3
2012-08-22 17:07:17 -05:00
Steve Harris
d5bb93d38f
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: e1cf4b0b9a7a4f4ac493b8ab6066f6e1cf4b0b9a7a4f4ac493b8ab6066f6b77a4d40d7b8ab6066f6b77a4d40d7fffd90541234fa4b5804b2c0dd1abb8f1120f6d8d404638d82
2012-08-22 16:00:33 -05:00
James Korman
28108e3193
Issue #798 - Correct for hdfFileId
...
Former-commit-id: 7d61470ce76d250cf9f356d6b1e8867d61470ce76d250cf9f356d6b1e886c2c228b42956d6b1e886c2c228b429ce2d764418ea24ef83b8654ecefd3e36e4ea8147dc185b6601
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
03f72891ea
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: e69aa9373504389b9f21a501aacb3be69aa9373504389b9f21a501aacb3ba5c57e8d24a501aacb3ba5c57e8d24a7872b1c6d5d988cc5c1c7bc786a60d8680dc6311c9dca6062
2012-08-22 13:03:24 -05:00
Steve Harris
8e09b55980
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: deb39fdbea04c8c3ca558e3ecc1efddeb39fdbea04c8c3ca558e3ecc1efdb8629a0f208e3ecc1efdb8629a0f200e79416277d974aaf2779565d18b96bbe382231fc9652b48f1
2012-08-22 13:01:08 -05:00
Steve Harris
598fdb5d07
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: 57c1be9f5a084ac9fbd4d38f8b80f057c1be9f5a084ac9fbd4d38f8b80f044a7cb75e7d38f8b80f044a7cb75e7a6797a478ab335416e0677369f78a6445d1a6a0d85533bdd24
2012-08-21 16:17:58 -05:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54c77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac39428d9faed979f7fb0b17bd572824561cb9b5c2094ed2d928d328e
2012-08-21 15:27:03 -05:00
Ron Anderson
fd53117c14
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: 0a6de388dd16231374f8d7a818fd1d0a6de388dd16231374f8d7a818fd1d7662d249abd7a818fd1d7662d249ab21b48541c36e3674f9fcd3693827a11b655b0826f69d7b9c64
2012-08-17 12:41:49 -05:00
Ron Anderson
c1d0cbae01
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: c71ee18e6e93c632c1ff1321db6a99c71ee18e6e93c632c1ff1321db6a99819b9c8e561321db6a99819b9c8e560a32c7c683e5952c1c996eafdda705f7b9190b51b78c280ac8
2012-08-17 12:20:08 -05:00
root
d0f911274c
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: e2b7a1679bac8888ae10342bda7e5fe2b7a1679bac8888ae10342bda7e5f6eec24180e342bda7e5f6eec24180ec7a8b1e7fdf0cb647101b3217ad886d1f2ac6698a689deb547
2012-08-15 22:29:38 +00:00
root
7b6fb2ec7f
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: b6e17e9b02d170ae704bb93989daafb6e17e9b02d170ae704bb93989daafba40e18fb2b93989daafba40e18fb2c8d09a5973fd69b031d23e9d1fa43064c3ccb4a484a8231c49
2012-08-15 22:29:07 +00:00
root
73466bae44
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd0987fc6b3dcb46f57879bb7b5341dd0987fc6b3dcb46f578795a453ee984cb46f578795a453ee984791f3f5b85537dbadf648a66b2f2091792158ef80eb9520e15
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
ff6c5dc660
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: ec41ec59eedd8ed9eca072c63e1a6fec41ec59eedd8ed9eca072c63e1a6f7bad34f90672c63e1a6f7bad34f906ebdadf4b8911bf8bb4c791493ee0b9e23523ad80bd2023ec70
2012-08-15 16:22:39 -05:00
