Bryan Kowal
|
c152d7678f
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]]
Former-commit-id: f92eb59a73
Former-commit-id: 76ee9afb3f [formerly 8d64fdba2c] [formerly 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c]]
Former-commit-id: 3ef9b4970b7c7eec89ff3c64f7174952b28b4ded [formerly 212afcceea]
Former-commit-id: 5b4c392e7f
|
2012-07-10 16:57:16 -05:00 |
|
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
|
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 |
|
David Gillingham
|
13b2df8c41
|
Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 9cc2c09ae5 [formerly 3c4e90e0bf] [formerly 0328fbf92c7293da9871a341342665168164a9a2 [formerly 2b5588bd1e]]
Former-commit-id: 5d55cc005839dda8cfa6803d81909c0ffb8ccde0 [formerly 2d82185a1d]
Former-commit-id: 69adfe2e40
|
2012-03-13 12:31:38 -05:00 |
|
Bryan Kowal
|
b29cbc5be3
|
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly b871752e3a [formerly fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]]
Former-commit-id: b871752e3a
Former-commit-id: 3e1e672233 [formerly d04bc82c9a] [formerly 3df9a673b587901bb723b61fae9fe68a607983cf [formerly 638d2c964b]]
Former-commit-id: 638e6f193c8e5f3613e0d0472cbb2ae78b006b0c [formerly 4c87af89f9]
Former-commit-id: 0c547b30ce
|
2012-03-08 09:00:55 -06:00 |
|
David Gillingham
|
9a3c195379
|
Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.
Former-commit-id: d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly 78c7f29096 [formerly 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]]
Former-commit-id: 78c7f29096
Former-commit-id: 038b850981 [formerly 5e2b3c3955] [formerly f703d811132f818c9f224c92beac74aea6d8f0ec [formerly 8a86e910aa]]
Former-commit-id: 6dc5df0140d31d3d91480386f33128d2b67b7fe9 [formerly b70345182d]
Former-commit-id: f91abb8deb
|
2012-03-07 16:05:54 -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 |
|
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 |
|