Steve Harris
1ee8938748
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 00f3d51546
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 448dd1c35f
Former-commit-id: 8fc896f7d4
2012-11-13 17:28:50 -06:00
Steve Harris
7192b19284
12.12.1-2 baseline
...
Former-commit-id: 6868eb9b23
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: a8560580f8
Former-commit-id: ed809a02db
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
626f398224
Merge branch 'ss_builds'(12.12.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: e8090e654b
[formerly 69fc030bb4
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: 69fc030bb4
Former-commit-id: ed4f88aa22
2012-11-13 16:00:19 -06:00
Steve Harris
8278cac143
12.12.1-1 baseline
...
Former-commit-id: e1498006c7
[formerly e4bd20a515
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
2012-11-07 12:41:20 -06:00
Dustin Johnson
7d0e4a6e75
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 31d7d09c10
[formerly 98d7beae50
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
2012-11-01 13:36:06 -05:00
Ben Steffensmeier
1a215cb42a
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: c2934ae7a5
[formerly 6a9ff88b33
[formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: 6a9ff88b33
Former-commit-id: 4f503d3a1e
2012-10-25 12:22:11 -05:00
Steve Harris
6e44abdba1
12.11.1-4 baseline
...
Former-commit-id: 6958b861f0
[formerly d3497e47eb
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
2012-10-16 13:27:07 -05:00
Ben Steffensmeier
a67ce9586c
Merge branch 'ss_builds' into Unified_Grid
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
Former-commit-id: 266a2f317f
[formerly 8b7256b1ae
[formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 8b7256b1ae
Former-commit-id: de3769129c
2012-10-12 12:45:50 -05:00
Steve Harris
04da0dbf50
12.11.1-2 baseline
...
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 1e02387ff1
[formerly c12ee14e66
[formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: c12ee14e66
Former-commit-id: 75901860c2
2012-10-08 13:26:20 -05:00
Steven Harris
ffe3641057
12.11.1-1 baseline
...
Former-commit-id: feec28f274
[formerly 618aa3f316
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
2012-09-27 15:57:45 -05:00
Steve Harris
9677f9321f
12.10.1-7 baseline
...
Former-commit-id: 7b37cfca85
[formerly b754630136
[formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]
Former-commit-id: b754630136
Former-commit-id: 2ee78eaf6d
2012-09-25 10:21:10 -05:00
Ben Steffensmeier
54767956bc
Issue #189 convert viz/d2d displays from grib to grid.
...
Former-commit-id: f918b6636f
[formerly 9632663c0a
[formerly 003825d9634299773ad96843cc82d56ded8a1391]]
Former-commit-id: 9632663c0a
Former-commit-id: 8e5b20236d
2012-09-24 14:05:22 -05:00
Steve Harris
ddc923e3e0
12.10.1-4 baseline
...
Former-commit-id: 92cc2d8605
[formerly 791ef6cedf
[formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 791ef6cedf
Former-commit-id: 9cd1f3ec0f
2012-09-13 12:33:36 -05:00
Steve Harris
0d8d18d7e2
12.10.1-4 baseline
...
Former-commit-id: 49c3861597
[formerly fd19ca5624
[formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
2012-09-13 12:08:11 -05:00
Steve Harris
0403e7d0a9
12.10.1-3 baseline
...
Former-commit-id: 969e7e6dfd
[formerly 21f430062b
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
2012-09-11 16:00:38 -05:00
Steve Harris
bb190a66a1
12.10.1-2 baseline
...
Former-commit-id: a66f3f4b60
[formerly 250f0ccac9
[formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: 250f0ccac9
Former-commit-id: dde1f4c54d
2012-09-11 15:50:57 -05:00
Steve Harris
7248f8b762
12.10.1-1 baseline
...
Former-commit-id: d708932029
[formerly 195158c004
[formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: 195158c004
Former-commit-id: 0abf64b77c
2012-09-04 12:07:27 -05:00
Steve Harris
6784576fc9
12.9.1-12 baseline
...
Former-commit-id: 150bc967a5
[formerly 948766c387
[formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]
Former-commit-id: 948766c387
Former-commit-id: 4bf4f0043a
2012-09-04 11:47:38 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
2012-08-21 15:27:03 -05:00
Steve Harris
71b024e3a1
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
b9fb1c89d4
12.9.1-1 baseline
...
Former-commit-id: 79ce6cfd97
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
2012-08-15 13:59:00 -05:00
Steve Harris
2e804fc8c4
12.8.1-5 baseline
...
Former-commit-id: cd49ef3eda
[formerly fd2abfb6f1
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
2012-08-01 10:45:37 -05:00
Steve Harris
b242dd98d6
12.7.1-8 baseline
...
Former-commit-id: c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
2012-07-19 16:20:40 -05:00
Steve Harris
32fdf6ed3b
12.6.1-9 baseline
...
Former-commit-id: 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
2012-07-10 07:53:49 -05:00
Steve Harris
2f10c7a1e4
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
2012-06-08 13:39:48 -05:00
Steve Harris
7fa9dbd5fb
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
2012-05-01 18:06:13 -05:00
Steve Harris
4767b0e069
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Steve Harris
760ead2047
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd9
[formerly 4068f5295f
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
2012-03-30 08:38:33 -05:00
Steve Harris
5a96582f16
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 7a10ca9766
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Steve Harris
829d2791e9
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1
[formerly c8aae98741
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
a811ac888f
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e25
[formerly 94c2ea985b
[formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 94c2ea985b
Former-commit-id: 85075e6107
2012-02-22 10:12:49 -06:00
Steve Harris
d129eab241
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: cc66c8be24
[formerly 4b76d22f77
[formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: 4b76d22f77
Former-commit-id: c268da57bc
2012-02-20 12:43:38 -06:00
Steve Harris
7b4b066a2b
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: b137302802
[formerly 93f6535bd8
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: 93f6535bd8
Former-commit-id: c209d6de36
2012-02-17 10:55:02 -06:00
Bryan Kowal
2f80fdcd73
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: c77b9558e1
[formerly 34d9122f14
[formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]
Former-commit-id: 34d9122f14
Former-commit-id: 8e552ca56f
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
0fe5fe9c99
Issue #228 change plots, grid icons, and radar icons
...
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.
Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2
Former-commit-id: 13a99abe7b
[formerly d976603262
[formerly 0f56c76ab830ef088a9576301c795dca7c855033]]
Former-commit-id: d976603262
Former-commit-id: 792dc75f4d
2012-02-01 12:45:56 -06:00
Nate Jensen
6418e0edda
Issue #181 fix ncep
...
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: 15e0a5e68d
[formerly ca923b9475
[formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]
Former-commit-id: ca923b9475
Former-commit-id: f3875948e8
2012-01-26 17:28:06 -06:00
Roger Ferrel
5fe3d78cb2
Issue #181
...
new files not indexed
Former-commit-id: 69f8daedff
[formerly 472e788dba
[formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]]
Former-commit-id: 472e788dba
Former-commit-id: 732004d9cd
2012-01-26 14:37:19 -06:00
Roger Ferrel
4444d34d91
Issue #181
...
The January ncep_build/build.cave changes
Former-commit-id: 750b17a81c
[formerly f00f3dd332
[formerly 29b4a3313d4cefd56f9697a31a767a9780de75a1]]
Former-commit-id: f00f3dd332
Former-commit-id: c5f7cfb665
2012-01-26 11:25:39 -06:00
Bryan Kowal
f522b77248
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
...
Former-commit-id: ff44a81ceb
[formerly 48b420cbb2
[formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]
Former-commit-id: 48b420cbb2
Former-commit-id: be61ec82b0
2012-01-23 12:36:13 -06:00
Matt Nash
d8da2252c3
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00