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
James Korman
16643cb1bc
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 1166a7cbb1
[formerly 38a2e426d9
] [formerly 4cbbc59278
[formerly cb05a9f95384806537106dc804833331d6c7db48]]
Former-commit-id: 4cbbc59278
Former-commit-id: 5df52e38f9
2012-07-31 13:38:23 -05:00
Nate Jensen
7d478ac74c
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 6f90bfa61c
[formerly a65e9608fd
] [formerly 4a2841b287
[formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: 4a2841b287
Former-commit-id: 8fa0eb70db
2012-07-31 08:57:54 -05:00
David Gillingham
32d5f7d347
Issue #828 : Ensure all baseline PurgeRules files live in only COMMON_STATIC, modify
...
PluginDao.getPurgeRulesForPlugin to search just COMMON_STATIC.
Change-Id: If0e9b37d423a5cdfe317194f952bbfb9697b9581
Former-commit-id: aa0ba41cf9
[formerly 3fffc47ba5
] [formerly abdcc32b2c
[formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]]
Former-commit-id: abdcc32b2c
Former-commit-id: ee57b63a0c
2012-06-29 13:01:42 -05:00
Bryan Kowal
76afa5d4b6
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: a1ba6c10be
[formerly e32406ca8a
] [formerly a4c6095b76
[formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]
Former-commit-id: a4c6095b76
Former-commit-id: 3b2d570834
2012-06-19 13:17:17 -05:00
Bryan Kowal
5db24885ba
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
...
Former-commit-id: cb16805e7e
[formerly 95a5887b06
] [formerly 25e20ad89c
[formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]
Former-commit-id: 25e20ad89c
Former-commit-id: fd8be91fed
2012-06-19 13:15:53 -05:00
Nate Jensen
d7841cef54
Issue #765 fix so data can be retrieved with or without hdfFileId
...
Former-commit-id: 619b70f7fc
[formerly ae384ddf24
] [formerly bb1ea105d2
[formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]
Former-commit-id: bb1ea105d2
Former-commit-id: 244ca1b88b
2012-06-18 17:20:48 -05:00
Steve Harris
23c34c469a
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: c7024992a3
[formerly 37793c86b1
] [formerly d325d496f5
[formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: d325d496f5
Former-commit-id: cf3c768213
2012-06-11 15:24:03 -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
53d2822329
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: d7f7c26582
[formerly 092efd6072
] [formerly 31b3e87ffa
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Dave Hladky
a1a3a361dd
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 42a12fa7a5
[formerly 1b7473572f
] [formerly 5b7ecea866
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 5b7ecea866
Former-commit-id: 61e31c62ff
2012-04-30 13:43:34 -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
David Gillingham
ea7a55ad8d
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: b31f40ec9d
[formerly 845e6c19af
] [formerly b056e18757
[formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: b056e18757
Former-commit-id: 87b15de88b
2012-01-26 17:38:43 -06:00
Dave Hladky
4e8acfaba3
Issue #15 Wes2Bridge time settings
...
Former-commit-id: 66fbee3e04
[formerly 594412a5b5
] [formerly b03b324ead
[formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]
Former-commit-id: b03b324ead
Former-commit-id: 2d53cfbe41
2012-01-25 10:53:51 -06:00
Matt Nash
82300ccdcf
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06: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