Commit graph

33 commits

Author SHA1 Message Date
Steve Harris
7bd478fc41 Revert "Replaced with formatted version"
This reverts commit e074710e0a [formerly cf9b267283] [formerly 18019c07a4] [formerly ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]].


Former-commit-id: c51c9ea5df [formerly 29c5918428] [formerly 8400028e11 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]
Former-commit-id: 8400028e11
Former-commit-id: b614bf53f6
2013-03-28 13:08:16 -05:00
Greg Armendariz
e074710e0a Replaced with formatted version
Former-commit-id: ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]
Former-commit-id: 18019c07a4
Former-commit-id: cf9b267283
2013-03-28 12:59:43 -05:00
Greg Armendariz
44fcd1a8db Add source variable
Former-commit-id: ae09ebb11f [formerly 8800080d2a] [formerly d0d889f11d [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]
Former-commit-id: d0d889f11d
Former-commit-id: 24fea6f45d
2013-03-28 08:56:50 -05:00
Steve Harris
428ec8a472 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: 979d6a5d8c [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: d997aeaee4
Former-commit-id: e67b16bb03
2013-03-27 18:21:05 -05:00
Steve Harris
936e4adda2 13.3.1-14 baseline
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9fba973fd0
Former-commit-id: 2ca160caf0
2013-03-27 17:59:34 -05:00
Mike Duff
b366778df0 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: c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
2013-03-26 09:19:39 -05:00
Steve Harris
f80f98cee2 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Dave Hladky
a997706b72 Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: dee8d745a3 [formerly a53797bc2f] [formerly f2e13c8078 [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]
Former-commit-id: f2e13c8078
Former-commit-id: 05ae375e08
2013-03-22 16:37:20 -05:00
Dave Hladky
01c6ff12a0 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: dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: bd17b99bd1
2013-03-20 12:41:33 -05:00
Steve Harris
7e96d841d9 13.3.1-9 baseline
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
2013-03-19 14:22:56 -05:00
Dave Hladky
9e97fc9efe Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6 13.3.1-7 baseline
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Dave Hladky
261d00c544 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: e7993c968d [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]
Former-commit-id: 41f2ea7efe
Former-commit-id: b1c8f153e0
2013-02-20 16:13:08 -06:00
Dave Hladky
a17dee033a Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 2655952304 [formerly 7b3a310f67] [formerly 381aec5976 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]
Former-commit-id: 381aec5976
Former-commit-id: 5c66cbcd27
2013-02-14 13:58:32 -06:00
Steve Harris
bbe92e6824 13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
2013-02-07 16:00:39 -06:00
Dave Hladky
b134741e4c Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf

Former-commit-id: 7b49430e34 [formerly c0712160d7] [formerly 7af5aab08a [formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]
Former-commit-id: 7af5aab08a
Former-commit-id: f6bd4ea0fa
2013-02-05 12:23:56 -06:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Ben Steffensmeier
339b57816f Issue #1358 fix forced basins and ffmp loading rfc ffg on startup.
Former-commit-id: 215f954d82 [formerly b536f26daa] [formerly 5039e5fa08 [formerly 901c629add69ab263d041919c45316512718b72a]]
Former-commit-id: 5039e5fa08
Former-commit-id: 04d7f608d1
2012-11-28 16:33:15 -06:00
Ben Steffensmeier
109ec1e778 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: ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
2012-11-13 16:00:19 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
2012-11-07 12:41:20 -06:00
Richard Peter
998278caf7 Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 5787d6278d [formerly 275398778f] [formerly 886375172b [formerly 73bca27407552c864765d5924e8609a253493f4c]]
Former-commit-id: 886375172b
Former-commit-id: bd1d87363a
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
a7d78f268f Issue #189 switch DAT to grid.
Former-commit-id: c2a12bbfdd [formerly 4d6358ec52] [formerly b3190ba34d [formerly a062b80648acb5d7ba664821bb9f65bdf985a971]]
Former-commit-id: b3190ba34d
Former-commit-id: a2b019d655
2012-10-01 15:38:53 -05:00
Ben Steffensmeier
6b058ace34 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 4fe2127bfb [formerly bd8eb7fc15] [formerly 05849f634d [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: 05849f634d
Former-commit-id: b547d9dd8f
2012-09-18 15:19:05 -05:00
Steve Harris
dc5ec3d16d 12.9.1-11 baseline
Former-commit-id: d07c18918d [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: fc405efab7
Former-commit-id: a14374fcd4
2012-08-30 14:36:12 -05:00
Steve Harris
f43a5af47f 12.9.1-10 baseline
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
2012-08-30 14:28:27 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Steve Harris
d7d60cc623 12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
2012-08-15 15:19:10 -05:00
Steve Harris
dab00b12e6 12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
2012-08-01 10:45:37 -05:00
Steve Harris
dc50bc8443 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Steve Harris
97c4db937e 12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
33a67cdd82 12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
root
8e80217e59 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00