xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3426 commits 31 branches 40 tags 3.8 GiB
Commit graph

347 commits

Author SHA1 Message Date
Richard Peter
9cf5e247ab Merge branch 'omaha_13.5.1' (13.5.1-15) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 5e5047cc4f [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]
Former-commit-id: 2a9276c728
Former-commit-id: db7c941f6f
 2013-08-14 15:23:18 -05:00
Bryan Kowal
64916e1833 Issue #2164 - fix 13.6.1 build 
Former-commit-id: 4604653241 [formerly 4604653241 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]
Former-commit-id: 586b7646f0
Former-commit-id: 8b3827c745
 2013-08-13 11:13:52 -05:00
Greg Armendariz
b66fcc40a5 13.5.1-13 baseline 
Former-commit-id: 29b823fee4 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
 2013-08-08 17:00:36 -04:00
Greg Armendariz
075a297be2 Merge "Issue #2213 - create the primary and backup exportgrids directories for GFESuite" into development 
Former-commit-id: 6fc06bb4e4 [formerly 6fc06bb4e4 [formerly 86902fe016dd65446e74c405a93ba0142affc9a4]]
Former-commit-id: f6f9b823d8
Former-commit-id: 8afd882a55
 2013-08-01 13:29:26 -05:00
Steve Harris
e16fce85ae 13.5.1-9 baseline 
Former-commit-id: 97fe6a670f [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]
Former-commit-id: 6e60cd9a79
Former-commit-id: bbb7f1dd49
 2013-08-01 09:20:23 -04:00
Richard Peter
5314b90720 Merge branch 'omaha_13.5.1' (13.5.1-8) into development 
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: 26df62db53 [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]
Former-commit-id: f97a27796d
Former-commit-id: 3f1e17765a
 2013-07-31 12:54:12 -05:00
Bryan Kowal
1c37911663 Issue #2164 - re-enable the build of awips2-notification 
Former-commit-id: 2ce33f335a [formerly 2ce33f335a [formerly 0c8b0a5d178b798b788a602b4053a864fa2f2286]]
Former-commit-id: 894aeda688
Former-commit-id: 96f0a6fb87
 2013-07-30 13:04:54 -05:00
Bryan Kowal
5886bd4607 Issue #2213 - create the primary and backup exportgrids directories for GFESuite 
- Amend: no longer create the exportgrids tmp directory

Change-Id: Id8aba47244c21d2d7e114ac1af6a29b9a8cd7059

Former-commit-id: f5eac74b94 [formerly f5eac74b94 [formerly 33229fe48556e43fefc8d14c223c0c9ed31ca1b9]]
Former-commit-id: 19a25a6222
Former-commit-id: a0bdbde908
 2013-07-29 17:57:31 -05:00
Steve Harris
1a3197efdf 13.5.1-8 baseline 
Former-commit-id: 3bece5e5d0 [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 2afb46f814
 2013-07-26 09:02:34 -04:00
Bryan Kowal
04b8d9d26c Issue #2164 - disable build of awips2-notification temporarily. 
Former-commit-id: 9ae7f63e26 [formerly 9ae7f63e26 [formerly 69f7d9afd3d61fe1a68b16b98d7d3a41d4fcc2c4]]
Former-commit-id: cccb37ebc0
Former-commit-id: 779c2ea7a2
 2013-07-24 12:45:29 -05:00
Greg Armendariz
3396444cea Issue #2214 - Correct syntax 
Former-commit-id: 62751f2af8 [formerly 62751f2af8 [formerly 0b398665c539949a624b9d2e3e0b11dcd501044d]]
Former-commit-id: df8dd8d71b
Former-commit-id: 6f0c139522
 2013-07-23 09:08:53 -05:00
Bryan Kowal
dbec306afd Issue #2206 - relocate ATBL directory change to 13.5 
Former-commit-id: bdcbf39a9a [formerly bdcbf39a9a [formerly e6bc04f738a19c56563e81d1924969640223f843]]
Former-commit-id: 7dcbe438e9
Former-commit-id: 1729820501
 2013-07-22 16:37:42 -05:00
Richard Peter
85fc9c773b Merge branch 'omaha_13.5.1' (13.5.1-7) into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 15d1a6eab0 [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]
Former-commit-id: c6386e306f
Former-commit-id: 12993d9539
 2013-07-22 09:40:18 -05:00
Steve Harris
eff4fb29dd 13.5.1-7 baseline 
Former-commit-id: bf58a81b38 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: 86ce1248c2
Former-commit-id: f9c9aecba5
 2013-07-18 12:07:22 -04:00
Bryan Kowal
1a93ae1636 Issue #2164 - fix 13.6.1 build 
Former-commit-id: df29ab238d [formerly df29ab238d [formerly a3eb33bc1e71a6930f17c63a09c924289d9d84ed]]
Former-commit-id: 1e8cd0b65e
Former-commit-id: 030835264c
 2013-07-15 11:33:10 -05:00
Greg Armendariz
ec2637676d 13.5.1-6 baseline 
Former-commit-id: 7e09fa5a0b [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: b9044b1195
Former-commit-id: 12a09f9aa7
 2013-07-10 10:04:22 -04:00
Bryan Kowal
e8885bf9c8 Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j 
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7

Former-commit-id: c91e636399 [formerly c91e636399 [formerly 0d4ba397163e0a365178d5481e520011784104d9]]
Former-commit-id: 86c27863fe
Former-commit-id: 594835f311
 2013-07-08 10:43:14 -05:00
Bryan Kowal
22c2eef5ee Issue #2133 - qpid is now a wrapped java application; incremented qpid release 
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: f6412117e1 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]
Former-commit-id: 38aa7723c6
Former-commit-id: 32190c8848
 2013-07-03 15:55:53 -05:00
Greg Armendariz
dc881f4ed8 13.5.1-5 baseline 
Former-commit-id: 492f92ef7b [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: ea7ac37930
Former-commit-id: 869922cb82
 2013-07-03 12:20:27 -04:00
Richard Peter
3d6754337a Merge branch 'omaha_13.5.1' (13.5.1-4) into development 
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: 162261c395 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]
Former-commit-id: 76bc31aa77
Former-commit-id: d3017ca60f
 2013-07-01 00:04:43 -05:00
Richard Peter
7ceb1bb9ab Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: 53258be797 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]
Former-commit-id: 582f38bdd4
Former-commit-id: 1757da59ee
 2013-06-30 23:46:32 -05:00
Steve Harris
c183e08922 13.5.1-4 baseline 
Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
 2013-06-28 09:46:25 -04:00
Roger Ferrel
b681d07346 Issue #1966 Initial Base configuration files for Dale Morris to test. 
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 2cfff5c563 [formerly 2cfff5c563 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]
Former-commit-id: c10f5c8d65
Former-commit-id: ee52f0281c
 2013-06-25 13:44:30 -05:00
Richard Peter
8f49eea08f Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: d262c02612 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]
Former-commit-id: b007d4a302
Former-commit-id: af1099b3fb
 2013-06-24 18:51:56 -05:00
Richard Peter
4b582fef50 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 744eb64856 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]
Former-commit-id: 37645245e5
Former-commit-id: a7594f8c93
 2013-06-24 18:36:15 -05:00
Steve Harris
1e939939b5 13.5.1-3 baseline 
Former-commit-id: 63803c1424 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
 2013-06-24 09:29:43 -04:00
Steve Harris
5343517c55 Merge branch 'omaha_13.5.1' into development 
Former-commit-id: 1e5ef65d03 [formerly 1e5ef65d03 [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]
Former-commit-id: cb95c711fd
Former-commit-id: 33bbec83ea
 2013-06-18 09:04:11 -05:00
Bryan Kowal
fcaf57d316 Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm 
Former-commit-id: cddb77b77b [formerly cddb77b77b [formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]
Former-commit-id: 6d58e92913
Former-commit-id: 8f6b0fef1a
 2013-06-17 15:46:23 -05:00
Steve Harris
316d2ec667 Merge branch 'omaha_13.5.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: 43316cbff9 [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]
Former-commit-id: 532d41787b
Former-commit-id: cb3e34813f
 2013-06-17 15:29:01 -05:00
Steve Harris
332a74c4de 13.5.1-2 baseline 
Former-commit-id: adb779323d [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
 2013-06-17 15:01:22 -04:00
Bryan Kowal
9fa7363600 Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine. 
Former-commit-id: 609c635703 [formerly 609c635703 [formerly 24d32835b66a8a84a19c9834fe1475e547dbc8c7]]
Former-commit-id: 772460c8ae
Former-commit-id: b94fa4b001
 2013-06-14 08:05:03 -05:00
Bryan Kowal
3ee84e116e Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database 
Former-commit-id: 7ef3040d7a [formerly 7ef3040d7a [formerly 1187c6a5220952a7cd8a10361ff344b3d7a65a47]]
Former-commit-id: e31e16741c
Former-commit-id: fc25b8179f
 2013-06-13 14:22:47 -05:00
Bryan Kowal
1463a53721 Issue #1924 - add spring extensions to awips2-groovy 
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: 180e01cf4c [formerly 180e01cf4c [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]
Former-commit-id: dbe58fa63d
Former-commit-id: 44740b014b
 2013-06-13 11:18:23 -05:00
Steve Harris
146c5e8940 13.5.1-1 baseline 
Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
 2013-06-10 15:17:17 -04:00
Steve Harris
abfd0b9ead Merge branch 'omaha_13.4.1' into development 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: 571757b2a6 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]
Former-commit-id: 2327205cb7
Former-commit-id: 035d74b348
 2013-06-06 15:46:23 -05:00
Steve Harris
8ec7524cbb 13.4.1-14 baseline 
Former-commit-id: c749e122eb [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: 18b90226a2
Former-commit-id: dee685e3c7
 2013-06-06 15:15:27 -04:00
Richard Peter
13f64a7da8 Merge branch 'omaha_13.4.1' (13.4.1-13) into development 
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: 192e5b9be8 [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]
Former-commit-id: 9e3baaa87a
Former-commit-id: ae09db35ad
 2013-06-04 14:06:53 -05:00
Bryan Kowal
36aa500077 Issue #1952 - remove the hydroapps dependency on awips2-edex-native. 
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56

Former-commit-id: 46c9ba7c7b [formerly 46c9ba7c7b [formerly 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b]]
Former-commit-id: 67cd73c655
Former-commit-id: f8e2a2f4f2
 2013-06-04 09:36:09 -05:00
Bryan Kowal
c6f4a5455f Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7 
- Amend: update 32-bit rpm build script

Change-Id: I23fae3f39e7fedb00b46fffb3aa1540dd87ed6b6

Former-commit-id: a78c84dcd7 [formerly a78c84dcd7 [formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]
Former-commit-id: 203d886739
Former-commit-id: f63c05e5cf
 2013-05-31 11:47:09 -05:00
Roger Ferrel
f2b4dd8aa1 Issue #2054 Minor changes to 2 grib patterns in the pqact template. 
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf

Former-commit-id: 85b9d9dea9 [formerly 85b9d9dea9 [formerly 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4]]
Former-commit-id: 2f2c553089
Former-commit-id: 593055e6c2
 2013-05-30 14:34:54 -05:00
Steve Harris
c9155c1631 13.4.1-13 baseline 
Former-commit-id: 87b9712009 [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]
Former-commit-id: de476791fb
Former-commit-id: b58cf237bf
 2013-05-29 16:30:09 -04:00
Nate Jensen
1fe16c9553 Issue #1989 remove high memory mode, reorganize wrapper.conf 
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: caf414bab0 [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]
Former-commit-id: 148b20f57c
Former-commit-id: 72ed3e21b3
 2013-05-29 12:06:15 -05:00
Bryan Kowal
f13a7f7ca5 Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui 
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8

Former-commit-id: bfd08efaa9 [formerly bfd08efaa9 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]
Former-commit-id: 8061922b70
Former-commit-id: 83c1e3127e
 2013-05-22 22:34:45 -05:00
Steve Harris
c184d31779 Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 8496832064 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]
Former-commit-id: 3590310f17
Former-commit-id: 0f9e0b343d
 2013-05-22 16:13:08 -05:00
Steve Harris
bd9b2e493e Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: 097617fa26 [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]
Former-commit-id: 462652e31e
Former-commit-id: 299690a202
 2013-05-22 16:10:04 -05:00
Steve Harris
0d9e71aee2 13.4.1-12 baseline 
Former-commit-id: 6a97b4325a [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: e53ada66b8
Former-commit-id: bd4f93e859
 2013-05-22 16:42:39 -04:00
Greg Armendariz
065e9bd1f9 Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development 
Former-commit-id: 20a9ad95e5 [formerly 20a9ad95e5 [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]
Former-commit-id: eecbf2718a
Former-commit-id: 525cd5c751
 2013-05-21 12:24:19 -05:00
Richard Peter
046de916fd Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 8aa4b0025c [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]
Former-commit-id: 930ff50fb8
Former-commit-id: 81ae3ea8bf
 2013-05-21 12:11:21 -05:00
Bryan Kowal
1052f6cd98 Issue #1952 - remove duplicate filesystem hierarchy 
Former-commit-id: 4b8868ca54 [formerly 4b8868ca54 [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]
Former-commit-id: 7027f97e2a
Former-commit-id: 62d21498a6
 2013-05-21 11:09:57 -05:00
Richard Peter
69e6ea4847 Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: 73372622f7 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]
Former-commit-id: 77a08ebd31
Former-commit-id: 427f54a878
 2013-05-21 10:35:00 -05:00