Steve Harris
bb88c2133a
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: d997aeaee4
[formerly 2a0e399dc8
[formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: 2a0e399dc8
Former-commit-id: 979d6a5d8c
2013-03-27 18:21:05 -05:00
Steve Harris
f9b3430485
13.3.1-14 baseline
...
Former-commit-id: 9fba973fd0
[formerly 9022c500ce
[formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9022c500ce
Former-commit-id: 91a5e4578e
2013-03-27 17:59:34 -05:00
Richard Peter
485a15cc15
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: b75ceeeeb3
[formerly 5287a3296b
[formerly 53cb92842c43349968b70bb5fec5beb100773b63]]
Former-commit-id: 5287a3296b
Former-commit-id: 25d4905570
2013-03-26 20:55:42 -05:00
David Gillingham
4c5493d607
Issue #1823 : Trigger SAT smart inits based only on sector id and physical element.
...
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: bebfc60317
[formerly 1df8d39919
[formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]
Former-commit-id: 1df8d39919
Former-commit-id: ad357638b3
2013-03-26 10:33:42 -05:00
Mike Duff
f767014e9a
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 9ebc7606b1
[formerly 5d72795e1b
[formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 5d72795e1b
Former-commit-id: c1f7d33bb8
2013-03-26 09:19:39 -05:00
Steve Harris
6f374b35d0
13.3.1-12 baseline
...
Former-commit-id: aaac0b51e5
[formerly 0be473728a
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
2013-03-25 13:27:13 -05:00
Steve Harris
ea052b14bb
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: dc419068f0
[formerly fa15f03e1b
[formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: fa15f03e1b
Former-commit-id: a9ced3a7ef
2013-03-20 16:06:20 -05:00
Steve Harris
76ea9120d8
13.3.1-10 baseline
...
Former-commit-id: 7078eec1b1
[formerly 073687d9a9
[formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 073687d9a9
Former-commit-id: 57f4676b6c
2013-03-20 15:53:01 -05:00
Dave Hladky
2cfb8f5ee0
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: 3cdbfa3f25
[formerly 90f7f2110b
[formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 90f7f2110b
Former-commit-id: dc7b231bf0
2013-03-20 12:41:33 -05:00
Steve Harris
6ebecda008
13.3.1-9 baseline
...
Former-commit-id: f2b3fddfe2
[formerly 468ae82305
[formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: 468ae82305
Former-commit-id: c7b2ef2d8c
2013-03-19 14:22:56 -05:00
Steve Harris
3e69490ab2
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
...
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: c18b96dc4c
[formerly 1a999fee5a
[formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: 1a999fee5a
Former-commit-id: 27c418812f
2013-03-18 16:43:22 -05:00
Steve Harris
dd30a5f940
13.3.1-8 baseline
...
Former-commit-id: c15b3ffe20
[formerly f97d78994b
[formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: f97d78994b
Former-commit-id: bc9df0a8f9
2013-03-18 15:43:32 -05:00
Dave Hladky
7d2c1bc4d5
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 5dc454c7ef
[formerly 38b952a220
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 38b952a220
Former-commit-id: 765be278bb
2013-03-13 13:56:33 -05:00
Steve Harris
23faf84455
13.3.1-7 baseline
...
Former-commit-id: e12ed113ae
[formerly a72254cc75
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: a72254cc75
Former-commit-id: 97d2f521e4
2013-03-13 09:50:28 -05:00
Dave Hladky
e17f8e0511
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: 4b08491880
[formerly a1006667e0
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: a1006667e0
Former-commit-id: 5c65862b8f
2013-03-12 15:48:34 -05:00
Steve Harris
4eef6862d6
13.3.1-6 baseline
...
Former-commit-id: 566b677d09
[formerly 3a4c7931e1
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
2013-03-12 08:35:45 -05:00
Nate Jensen
8a5ebbb9c9
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 5c59a61cef
[formerly 5e3d6df7e0
[formerly 392feade3f36680edcdb135f7c061be172210c26]]
Former-commit-id: 5e3d6df7e0
Former-commit-id: 5d9778a8d6
2013-03-07 16:49:40 -06:00
Steve Harris
3ec20c1689
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 57f42761d7
[formerly 305dd72969
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 305dd72969
Former-commit-id: 61a19a460b
2013-03-05 12:27:49 -06:00
Steve Harris
9066d511fe
13.3.1-4 baseline
...
Former-commit-id: 2edca90902
[formerly 8c0b90f292
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
2013-03-05 10:39:59 -06:00
David Gillingham
e2a7d7a350
Issue #1447 : Initial commit of VTEC table sharing functionality: port A1 changes to
...
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: 9351f33c1c
[formerly 50744c1f92
[formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 50744c1f92
Former-commit-id: ca81ae4a71
2013-03-01 11:05:02 -06:00
Bryan Kowal
1b65ae1967
Issue #1662 - wrapper parameters can now be used to specify the order
...
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters
Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c
Former-commit-id: 44349717fb
[formerly 8bf5e3ffad
[formerly aae64b29491d8da0001cf1182a357683546d4593]]
Former-commit-id: 8bf5e3ffad
Former-commit-id: 5b3478d6c7
2013-02-27 12:46:48 -06:00
Ron Anderson
547f0d086f
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: f37999b1eb
[formerly bfe3c684df
[formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: bfe3c684df
Former-commit-id: d43afc8c67
2013-02-26 18:44:51 -06:00
Dustin Johnson
eaa295dddb
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: 722e41b8b0
[formerly d58d28c636
[formerly 2b52368c81272df18f3af1334057295d11bb4b52]]
Former-commit-id: d58d28c636
Former-commit-id: ebf02481f0
2013-02-26 11:32:03 -06:00
Steve Harris
650db426b9
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: e8135b9c14
[formerly b50e384a0f
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: b50e384a0f
Former-commit-id: cd99e680bb
2013-02-25 16:05:22 -06:00
Steve Harris
90b0bab156
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 6ec9e73035
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 67f090638f
Former-commit-id: 0a4564eb97
2013-02-25 15:58:48 -06:00
Bryan Kowal
1ea7fbe69e
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: 0d2262c0bf
[formerly b05073fbe3
[formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]
Former-commit-id: b05073fbe3
Former-commit-id: 4d160993fb
2013-02-25 11:30:13 -06:00
Steve Harris
0b3acc0130
13.3.1-2 baseline
...
Former-commit-id: 3d115ed3be
[formerly df6d6f598e
[formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: df6d6f598e
Former-commit-id: 3e60b23072
2013-02-25 10:18:36 -05:00
Bryan Kowal
6f419ae22f
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: d5c8b82941
[formerly 7c62991edf
[formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]
Former-commit-id: 7c62991edf
Former-commit-id: 4cd5453e0a
2013-02-22 09:28:37 -06:00
Steve Harris
abdc733151
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: a0573644c4
Former-commit-id: 64744fdb19
2013-02-21 15:41:39 -06:00
Bryan Kowal
0d4a63efe4
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 803397c7c7
[formerly a8fb04f41c
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: a8fb04f41c
Former-commit-id: 519ce2c0fb
2013-02-21 13:55:28 -06:00
Steve Harris
9bdd52a626
13.3.1-1 baseline
...
Former-commit-id: cabc8cf8b4
[formerly 0563d7ac18
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: 0563d7ac18
Former-commit-id: 96768407a5
2013-02-21 09:36:59 -05:00
Steve Harris
e0406d3183
13.3.1-1 baseline
...
Former-commit-id: d2a654625f
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
2013-02-20 16:19:40 -06:00
Dustin Johnson
597908f34d
Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO
...
- Change new registry modes to explicitly list includes/excludes.
- Add separate bandwidth manager creation capabilities for NCF and WFO.
- Add deltaScript to add a "route" slot to subscriptions.
- Remove unnecessary schemas from Spring files.
Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa
Former-commit-id: c8760e5699
[formerly d8659e742e
[formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]
Former-commit-id: d8659e742e
Former-commit-id: d4afef2cab
2013-02-20 10:42:51 -06:00
Dustin Johnson
8532c28461
Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
...
Amend:
Use ref syntax with uri.
Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062
Former-commit-id: 116809346b
[formerly cc598094fa
[formerly 66fe560026848357ae165a675be9818da719675d]]
Former-commit-id: cc598094fa
Former-commit-id: 2a588688b1
2013-02-18 15:47:17 -06:00
Ben Steffensmeier
d35b79d537
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: 0933a5f596
[formerly 1393f3e3cf
[formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]
Former-commit-id: 1393f3e3cf
Former-commit-id: e771076275
2013-02-15 11:39:56 -06:00
Ben Steffensmeier
31605a14aa
Issue #1614 allow locationNames for grid data access
...
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2
Former-commit-id: 9b4de367e3
[formerly ab319bd3a8
[formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]
Former-commit-id: ab319bd3a8
Former-commit-id: ef7addb005
2013-02-14 10:07:01 -06:00
Matt Nash
d2f552ea31
Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused.
...
Change-Id: I36d72ed9642752eb92ae0902892bd79810111c07
Former-commit-id: da21cf82e9
[formerly 1c504de33e
[formerly 4b56329756881b3291ad2856a5c166cdfc635bf9]]
Former-commit-id: 1c504de33e
Former-commit-id: 2bed543d32
2013-02-12 12:02:48 -06:00
Dustin Johnson
c79c031f62
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: ef32853dc1
[formerly 8307af022c
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]
Former-commit-id: 8307af022c
Former-commit-id: 0d548bd66f
2013-02-11 14:21:57 -06:00
Steve Harris
52f48669f6
13.2.1-6 baseline
...
Former-commit-id: a46e33f06e
[formerly d0752de66c
[formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: d0752de66c
Former-commit-id: d66ad2f77b
2013-02-07 16:00:39 -06:00
Steve Harris
9b7251d17e
13.2.1-6 baseline
...
Former-commit-id: 53adfb7345
[formerly b80782b081
[formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]
Former-commit-id: b80782b081
Former-commit-id: cc48fa4fc6
2013-02-07 16:38:44 -05:00
Steve Harris
953bec4467
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 5ee47e098d
[formerly 4bc8e9ab5c
[formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 4bc8e9ab5c
Former-commit-id: da43a7a8ca
2013-02-06 11:12:01 -06:00
Steve Harris
44a4287812
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 6c6b53679b
[formerly a16ac7819c
[formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: a16ac7819c
Former-commit-id: 14f23d4227
2013-02-06 11:08:53 -06:00
Steve Harris
7e1236c17c
13.2.1-5 baseline
...
Former-commit-id: 146fcc6da8
[formerly 232734091d
[formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 232734091d
Former-commit-id: a6b3cde1ff
2013-02-06 11:02:32 -06:00
Brad Gonzales
7cef72a460
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 5bc6dd5498
[formerly f459554e33
[formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]
Former-commit-id: f459554e33
Former-commit-id: 35cc853c74
2013-02-04 08:52:33 -06:00
Steve Harris
ed224fde88
13.2.1-4 baseline
...
Former-commit-id: 0d7f53b6f4
[formerly 8f2e7d4437
[formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 8f2e7d4437
Former-commit-id: ae2859d5a2
2013-01-31 11:40:31 -06:00
Steve Harris
5acf001c1b
13.2.1-4 baseline
...
Former-commit-id: 1e77a6f0bd
[formerly 1beb655fa0
[formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]
Former-commit-id: 1beb655fa0
Former-commit-id: f2b28cfa56
2013-01-31 12:05:59 -05:00
Steve Harris
f207d282bc
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: ec56acde81
[formerly 658bea377b
[formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: 658bea377b
Former-commit-id: c218786986
2013-01-31 10:19:14 -06:00
Steve Harris
e6093b159e
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: 6040272573
[formerly 0505ed0a72
[formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 0505ed0a72
Former-commit-id: e655d297f7
2013-01-29 15:57:21 -06:00
Steve Harris
b84acc06da
13.2.1-3 baseline
...
Former-commit-id: 7a739c6a5b
[formerly f45120a1f4
[formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: f45120a1f4
Former-commit-id: 283147571f
2013-01-29 15:52:43 -06:00
Steve Harris
74bfe9595c
13.2.1-2 baseline
...
Former-commit-id: c3e4551dfa
[formerly 7a7f7c45ca
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: 7a7f7c45ca
Former-commit-id: 0006a2b6cb
2013-01-25 09:07:12 -06:00