Steve Harris
|
2f6ae50479
|
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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560]
Former-commit-id: d040b14742
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
80108c0af9
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34 [formerly 51bb9ebb46] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860]
Former-commit-id: f51d290333
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
9340618732
|
12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
8850e44772
|
Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 239813406d [formerly 65aa72fee7] [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]]
Former-commit-id: 5a694628c15cf0ff0b617182e7f4ca869e47cb8d [formerly 5a310acb18]
Former-commit-id: 0a7cb5fd7a
|
2012-03-29 10:03:05 -05:00 |
|
Bryan Kowal
|
db90c1809d
|
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 69e6f68295 [formerly 5ba68624c5] [formerly 8a4c883e0b] [formerly 69e6f68295 [formerly 5ba68624c5] [formerly 8a4c883e0b] [formerly 31f989ecb4 [formerly 8a4c883e0b [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]]]
Former-commit-id: 31f989ecb4
Former-commit-id: 5009de761a [formerly e27502effd] [formerly a23c215ea5b5c94cb670f657e0aafe5ca63f7dde [formerly 81a360d139]]
Former-commit-id: 8fe130f1144ae3cbedbd14148c987770a657bb45 [formerly 339d963f90]
Former-commit-id: c52c131e5c
|
2012-03-21 16:49:38 -05:00 |
|
Bryan Kowal
|
004143b566
|
Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
Former-commit-id: bdb4777017 [formerly d4142689c9] [formerly 4d8d3d4d00] [formerly bdb4777017 [formerly d4142689c9] [formerly 4d8d3d4d00] [formerly c803afd454 [formerly 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]]
Former-commit-id: c803afd454
Former-commit-id: 6a3ecc4a79 [formerly f046b941ba] [formerly c9f4c7e859d1fac6dc6d9e694a3d0b274cf87b59 [formerly 033a4e237b]]
Former-commit-id: f3e5ddd3f65cf224c8de269536f0285debc4a002 [formerly 2cc79e1acb]
Former-commit-id: c8c031d8d7
|
2012-03-07 10:22:40 -06:00 |
|
Steve Harris
|
85d3d96d4c
|
Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 2dbdc945bf [formerly 73a337bc31] [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]]
Former-commit-id: 9ad2c540c010a2b27f18bb9c98356065c7663bd2 [formerly 21f12bae82]
Former-commit-id: f8ae79c35c
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
43ff909553
|
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: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
3a4af24369
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
90432da18a
|
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]]
Former-commit-id: 496cc6a06b
Former-commit-id: 3371e158a6 [formerly dd3a5a8d88] [formerly 8f3e38d67a9e00af420a14793a365b7fbe9bd292 [formerly 4a93298877]]
Former-commit-id: 745a23d67040229fe246ffa1c83646920a36c89f [formerly 37e57b6588]
Former-commit-id: 7ca623525e
|
2012-02-20 16:38:06 -06:00 |
|
Steve Harris
|
f1abad69fd
|
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]]
Former-commit-id: 23cc9689de
Former-commit-id: f3d32f34ce [formerly a85a777232] [formerly 601b02191762801f860cf28b52a200c6e003e7ea [formerly a2e3aabc60]]
Former-commit-id: 14ed1eaa2666eb1db1b97a732045d1fc5b864aba [formerly b2999a6d59]
Former-commit-id: 3598fb2fcd
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
44fcb44d45
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: e21fc62dd9 [formerly 74c156e508] [formerly 5e47f8c33a] [formerly e21fc62dd9 [formerly 74c156e508] [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]]]
Former-commit-id: a91b01bfbe
Former-commit-id: 1d02286ab1 [formerly 98b223d08e] [formerly 4e98d4f2cb2afa20c737603123503ba7a42a68ea [formerly 39b13d7102]]
Former-commit-id: 202ae427973d5fcd9dad1196212f733362bbbc31 [formerly ad1f608967]
Former-commit-id: 79698247d7
|
2012-02-15 12:54:54 -06:00 |
|
Ben Steffensmeier
|
be33534dea
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 2edb2afe04 [formerly 808846e237] [formerly 944e59e989] [formerly 2edb2afe04 [formerly 808846e237] [formerly 944e59e989] [formerly f65d86a06a [formerly 944e59e989 [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]]
Former-commit-id: f65d86a06a
Former-commit-id: 6212d0efc7 [formerly 993f2aafa4] [formerly 2203a419ff9c3a59fd6802a9ac886bf01d7ca8c3 [formerly d00572c122]]
Former-commit-id: 0c58fbd21f81bc1efc1a1672d07433fa637d3c8d [formerly 800e674078]
Former-commit-id: 16b7863b52
|
2012-02-14 15:46:11 -06:00 |
|
Jonathan Sanchez
|
ba71458ba7
|
Issue #19 Committed changes to Wes2Bridge branch.
Former-commit-id: a9ad92724b [formerly 869de9a03b] [formerly 12a5931e75] [formerly a9ad92724b [formerly 869de9a03b] [formerly 12a5931e75] [formerly 4bce8e5ece [formerly 12a5931e75 [formerly c0a860f692ba514f9ea7566fb0e3c00de05d8c92]]]]
Former-commit-id: 4bce8e5ece
Former-commit-id: f2efed11e0 [formerly 094c4173ae] [formerly 5de258a4f3203c5a0bff8426138f4ebf474257fa [formerly 67dd0f65d6]]
Former-commit-id: 9193c2db75dca5b1a7b9d992df87ee101093f613 [formerly ea8d874283]
Former-commit-id: 8eb7f1f3de
|
2012-01-24 10:20:28 -06:00 |
|
Bryan Kowal
|
6f6807cf2c
|
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
Former-commit-id: 1f78572a88 [formerly a37509adf3] [formerly c08293a1dc] [formerly 1f78572a88 [formerly a37509adf3] [formerly c08293a1dc] [formerly bda5954b3c [formerly c08293a1dc [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]]]]
Former-commit-id: bda5954b3c
Former-commit-id: 4de9df58d2 [formerly 886b054204] [formerly 5664e8a8142fc8da0f99829e995713cc1f2640fe [formerly 6a07f850bd]]
Former-commit-id: 0bf952e5fbda8438e32b3746ca46941077b403e0 [formerly f3e97815fe]
Former-commit-id: 079f58f996
|
2012-01-23 14:39:39 -06:00 |
|
Bryan Kowal
|
a89f0a64f0
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]]
Former-commit-id: ea1c82452b
Former-commit-id: 69f4822ad1 [formerly 9f6780c4dd] [formerly e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]]
Former-commit-id: ed7bf459df1503ce7bd9500dc984c56a535b768f [formerly dafb6b18d8]
Former-commit-id: bb662ca175
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
Bryan Kowal
|
5c81820a8a
|
Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]]
Former-commit-id: 9d64e1df12
Former-commit-id: f19cf1c4ee [formerly 281be5e0b7] [formerly 9ceb347a77 [formerly 06187b93be]]
Former-commit-id: 9ceb347a77
Former-commit-id: 5d92644c26
|
2012-01-18 16:00:45 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|