Greg Armendariz
|
953cad233b
|
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: c449eec5b0 [formerly fece69eb09] [formerly 2994753636] [formerly 2994753636 [formerly 1e48076fb2]] [formerly 58eaf444bd [formerly 2994753636 [formerly 1e48076fb2] [formerly 58eaf444bd [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]]
Former-commit-id: 58eaf444bd
Former-commit-id: dc768b0ae3d4822aab8b190f0d9b525aa111888e [formerly ac1328cf7911a36196114732a8d00e8c762670a8] [formerly 9f6eff005b [formerly e1d91769fe]]
Former-commit-id: 9f6eff005b
Former-commit-id: 72793f2c24
|
2014-04-30 19:34:43 -05:00 |
|
Brian Clements
|
263f509786
|
Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: dd9810ab2e [formerly b3825b8032] [formerly e49d150332] [formerly e49d150332 [formerly 57f5ac701c]] [formerly 1273846844 [formerly e49d150332 [formerly 57f5ac701c] [formerly 1273846844 [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]]
Former-commit-id: 1273846844
Former-commit-id: 2be124a114697cf4084a97add0a4721d40fb1e99 [formerly dfe08f3eccdfa7204ab4aa439b2e37da97873ec7] [formerly 9fc8796247 [formerly a074b27951]]
Former-commit-id: 9fc8796247
Former-commit-id: fc004a1db8
|
2014-04-30 16:41:14 -05:00 |
|
Greg Armendariz
|
17853714c3
|
Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: fe825c5888 [formerly 239ce27244] [formerly 4c245da2a2] [formerly 4c245da2a2 [formerly 4981b6a438]] [formerly 2d38c69ac1 [formerly 4c245da2a2 [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 0fb32fe9fa90ea98c30dff9ceb9f919985650750 [formerly 9e10990e64fcefc2ae835d7e6bae34e0905df35d] [formerly 94a55e5c31 [formerly 784235ab9f]]
Former-commit-id: 94a55e5c31
Former-commit-id: b069ee1ea3
|
2014-04-30 15:42:42 -05:00 |
|
Richard Peter
|
a0ffae6c6b
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 3d9938c5a3 [formerly 8b1a177110] [formerly 67683dd891] [formerly 67683dd891 [formerly 44b1782461]] [formerly 32957285fc [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: f7f2cdcc4b250524846ce9a4063e651d4182d7a2 [formerly 2a324b0264c6962014f41df55690c7e2b09955e1] [formerly 6966b79246 [formerly 80d4153878]]
Former-commit-id: 6966b79246
Former-commit-id: 0dfa8cc4c6
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
3e80889eb6
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 83727709c6 [formerly 362d882b40] [formerly f0b8ea5822] [formerly f0b8ea5822 [formerly fb1f5aa593]] [formerly 3524838f9f [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 7eb8ff57ff4d7d383497a38960663b90f905f7b8 [formerly bb5a7e713dac6962660d9c769971464b6792cb76] [formerly bf3758efa3 [formerly 029f5753ad]]
Former-commit-id: bf3758efa3
Former-commit-id: 14a63a19e1
|
2014-04-25 11:06:11 -04:00 |
|
Richard Peter
|
957f22f1e0
|
Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
Former-commit-id: 092eea9229 [formerly b77f780b13] [formerly c0656c811d] [formerly c0656c811d [formerly b53d914640]] [formerly a21a2bafe1 [formerly c0656c811d [formerly b53d914640] [formerly a21a2bafe1 [formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]]]]
Former-commit-id: a21a2bafe1
Former-commit-id: 8e6d4100bb274db955dc9b9a9b0764838d6a6067 [formerly ee378d853649aba6df5e619b61b93f4fe55d590e] [formerly 608b342707 [formerly d08c051727]]
Former-commit-id: 608b342707
Former-commit-id: a0f425fe91
|
2014-04-24 15:43:15 -05:00 |
|
Brad Gonzales
|
f670f77b3b
|
Issue #3035 Increment java component.spec revision value.
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf
Former-commit-id: a0e425d33f [formerly 6b41668093] [formerly 86036c0afb] [formerly 86036c0afb [formerly 15985b9eac]] [formerly 7a0694adca [formerly 86036c0afb [formerly 15985b9eac] [formerly 7a0694adca [formerly 245c5214910e1a69d1a6de4b46a36130dbd253b4]]]]
Former-commit-id: 7a0694adca
Former-commit-id: ccf97ab53d18c2c43320a21a11da0da31d61f3be [formerly 8652fe2bf8054c087b7cef1ac2839772b6556ea6] [formerly f9b04639a4 [formerly 5fa1165519]]
Former-commit-id: f9b04639a4
Former-commit-id: 7c1b5b5893
|
2014-04-24 12:48:40 -05:00 |
|
David Gillingham
|
6b4c357dec
|
Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec
Former-commit-id: a4876f339a [formerly 0566286204] [formerly 6186e67e5c] [formerly 6186e67e5c [formerly eea20ba3ef]] [formerly 16adfb2573 [formerly 6186e67e5c [formerly eea20ba3ef] [formerly 16adfb2573 [formerly 0b91ae192358aa162833fb332ba4e551878199f9]]]]
Former-commit-id: 16adfb2573
Former-commit-id: 81a7cbf353c01f8febf3adc59448fbb4504b5d08 [formerly 2e2cf73a5ee2285806fb961bd9f68a867233523e] [formerly 123bd80fa9 [formerly 9f27fa7562]]
Former-commit-id: 123bd80fa9
Former-commit-id: 0cbcdd8519
|
2014-04-24 11:11:06 -05:00 |
|
Brad Gonzales
|
43027b11d4
|
Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script.
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1
Former-commit-id: a82bea7327 [formerly 9c6f68a56f] [formerly 5957c45cea] [formerly 5957c45cea [formerly fdfac581d6]] [formerly 1fcffc5db8 [formerly 5957c45cea [formerly fdfac581d6] [formerly 1fcffc5db8 [formerly fdf7e47c2ddcfe4154ee117a0b5a722cd420df20]]]]
Former-commit-id: 1fcffc5db8
Former-commit-id: fe2424b1e2f708fa79cc352eae569e4b854532b9 [formerly 86a837c9ba02a232e781433a5fdcf46bfeb6af6d] [formerly c11506a0c9 [formerly 679a623d87]]
Former-commit-id: c11506a0c9
Former-commit-id: 26b95f945e
|
2014-04-22 15:39:08 -05:00 |
|
Brad Gonzales
|
51a7d3c34f
|
Issue #3035 Removed jrockit missioncontrol from awips2 java rpm build.
Change-Id: I558e0f080b46c76cbdfb759ef1c1a701925273ca
Former-commit-id: 40ee3f5661 [formerly ed82a7f477] [formerly 3a3e0be7a4] [formerly 3a3e0be7a4 [formerly 90c7e699fa]] [formerly 4c21afaa1b [formerly 3a3e0be7a4 [formerly 90c7e699fa] [formerly 4c21afaa1b [formerly 254c7e0298ba7fb3ad91af2d51a1bd41b0535631]]]]
Former-commit-id: 4c21afaa1b
Former-commit-id: 7fd6c58f5e888f471c839d9d5bf78653aaa2eef5 [formerly 44e44ccc27afeb322968ac9c4d880dc5c0ee5207] [formerly 258ddf9036 [formerly 17ac32a672]]
Former-commit-id: 258ddf9036
Former-commit-id: dd469cc103
|
2014-04-22 12:23:15 -05:00 |
|
Nate Jensen
|
5420d8d4e1
|
Merge "Issue #2984 another attempt to fix build" into development
Former-commit-id: 62bae5bad5 [formerly 8a1e3a9bef] [formerly 7f56e20c03] [formerly 7f56e20c03 [formerly 5424ffb850]] [formerly 26b20a770a [formerly 7f56e20c03 [formerly 5424ffb850] [formerly 26b20a770a [formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]]]
Former-commit-id: 26b20a770a
Former-commit-id: c9e33bd2bd4f7c10f264a62690688f9777c2d236 [formerly 74e82875616825eaf646c27a93474963262f4aed] [formerly 0c82511428 [formerly cf3e9e9020]]
Former-commit-id: 0c82511428
Former-commit-id: b63c42673f
|
2014-04-15 13:27:29 -05:00 |
|
Nate Jensen
|
e422afb215
|
Issue #2984 another attempt to fix build
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: 4a6f5b41d3 [formerly fc8be532a1] [formerly cb406ef865] [formerly cb406ef865 [formerly a2354a1d2a]] [formerly 09305d263e [formerly cb406ef865 [formerly a2354a1d2a] [formerly 09305d263e [formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]]]
Former-commit-id: 09305d263e
Former-commit-id: dc7891695ab3b25edf2e81631cedf276fbfab12b [formerly c383e23eae82fa10b3e1724bbc784d32fdfd1fee] [formerly 3186527f18 [formerly 60b8b6e4ad]]
Former-commit-id: 3186527f18
Former-commit-id: f0ea970f51
|
2014-04-15 13:16:17 -05:00 |
|
Richard Peter
|
34a5a0bd02
|
Issue #2726: Fix context mappings for topics
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: 2f00c2dd7e [formerly bb04dd7885] [formerly f533275291] [formerly f533275291 [formerly ecbd0d5720]] [formerly 4ac996336e [formerly f533275291 [formerly ecbd0d5720] [formerly 4ac996336e [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]]]
Former-commit-id: 4ac996336e
Former-commit-id: c4e2e78451f376b517d468da8d811c1ea9b241bd [formerly 39575ca8f26452d9d3cfc245c888d649d3dd6f86] [formerly d40449dae9 [formerly 35b8b8bc15]]
Former-commit-id: d40449dae9
Former-commit-id: c54607083f
|
2014-04-15 12:49:15 -05:00 |
|
Richard Peter
|
6130da84a1
|
Issue #2726: Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files.
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d
Former-commit-id: d89c4b3cc7 [formerly 63c484cf14] [formerly 45e6301b91] [formerly 45e6301b91 [formerly 4709e66b34]] [formerly fa25d55384 [formerly 45e6301b91 [formerly 4709e66b34] [formerly fa25d55384 [formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]]]
Former-commit-id: fa25d55384
Former-commit-id: e395e26f4318292291ffb9c2634b75d850e16763 [formerly 85a7299b471586523b314346c141f900d516f459] [formerly 7e3e0fb984 [formerly fa5c0f71ad]]
Former-commit-id: 7e3e0fb984
Former-commit-id: a0c08e67ea
|
2014-04-15 11:50:28 -05:00 |
|
Nate Jensen
|
f52144a1b3
|
Issue #2984 attempt to fix build
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: 8c587ce27c [formerly f39f61518f] [formerly ce585ca9e4] [formerly ce585ca9e4 [formerly 4aaa7c7096]] [formerly 456359ab1a [formerly ce585ca9e4 [formerly 4aaa7c7096] [formerly 456359ab1a [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]]]
Former-commit-id: 456359ab1a
Former-commit-id: 868b311646cb77246b6158897b2f881cf2b77974 [formerly e7f43a47947a927cf841070a7c70e8a56b5e3f62] [formerly 0177329d67 [formerly f6b3c3c05f]]
Former-commit-id: 0177329d67
Former-commit-id: e91352d8a8
|
2014-04-15 09:57:11 -05:00 |
|
Richard Peter
|
7cfc0b06c7
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 288febacc7 [formerly efd1003a50] [formerly 5676090443] [formerly 5676090443 [formerly 95eba8dcf6]] [formerly b15d288530 [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: ed8609133e05b5d0ee1912e5ac34a16a3fe104ac [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff] [formerly f1b85f6964 [formerly 73aab15d85]]
Former-commit-id: f1b85f6964
Former-commit-id: 47795836f2
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
a1b4b5a315
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 0c8117982f [formerly 2eec862ebb] [formerly 17477e7db1] [formerly 17477e7db1 [formerly 6a28fcb156]] [formerly dd98c213c7 [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: fc3c00a17bb7a79f8b61454b8d40e68f136d1ced [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c] [formerly 47d9095211 [formerly 9f37f61cf8]]
Former-commit-id: 47d9095211
Former-commit-id: 8ba2694d8e
|
2014-04-04 12:57:32 -04:00 |
|
Brad Gonzales
|
2ed6815f9c
|
Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
rpm to replace it. Changed dependency references to httpd-collaboration to refer to collab-dataserver.
Amend: Updated call to status in init script.
Redirect start.sh error output to an error file.
Use macro to define ant opts in component.spec.
Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4
Former-commit-id: c92b8ccb34 [formerly 9ff7dd12aa] [formerly fe8e6a1fa1] [formerly fe8e6a1fa1 [formerly 4fa60427b4]] [formerly f0189d61ca [formerly fe8e6a1fa1 [formerly 4fa60427b4] [formerly f0189d61ca [formerly d7466d36140c94b5ef4e57fea25526231912e018]]]]
Former-commit-id: f0189d61ca
Former-commit-id: a145c6b6da77e77839533634a79d5fab9d35c8d1 [formerly 7c33a8781ee872ff0c5e225ac1d343ecd2c0eaee] [formerly 907d09bc20 [formerly 3954cd6bae]]
Former-commit-id: 907d09bc20
Former-commit-id: efb4981a15
|
2014-04-03 17:47:58 -05:00 |
|
Ben Steffensmeier
|
8001942f43
|
Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 2f4bd06900 [formerly 9e2e500040] [formerly 1c18e800b3] [formerly 1c18e800b3 [formerly 55046a8e1e]] [formerly 12ed72b0c0 [formerly 1c18e800b3 [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: 0aa0a47fa5d9794bd8e68921593b07392beda247 [formerly 17445664d752b4ffa0186bdce951baaffefd1f21] [formerly aadc22091e [formerly ab8293c6a1]]
Former-commit-id: aadc22091e
Former-commit-id: 26558fad1e
|
2014-03-24 11:10:18 -05:00 |
|
Steve Harris
|
248459109c
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 4bff39258e [formerly 1dd9192564] [formerly 5efb16fa8b] [formerly 5efb16fa8b [formerly d0aeb854f5]] [formerly 0c2c5ad4bd [formerly 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 49c36ccdd7c47e709711998ff99d0e08642ad435 [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb] [formerly 5d95d594f8 [formerly b5a2d2237f]]
Former-commit-id: 5d95d594f8
Former-commit-id: 016a659753
|
2014-03-17 15:55:41 -05:00 |
|
Brian.Dyke
|
3205d13c8a
|
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 2a15f0bdd8 [formerly e85e3c2e70] [formerly 9f332e938c] [formerly 9f332e938c [formerly d23acbdd48]] [formerly 9c412e444e [formerly 9f332e938c [formerly d23acbdd48] [formerly 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 9f0f5fe75522840041429f87049d478358ebcd43 [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f] [formerly 57f7e4b084 [formerly 88efccf309]]
Former-commit-id: 57f7e4b084
Former-commit-id: 39ef07d49f
|
2014-03-14 11:13:30 -04:00 |
|
Brian.Dyke
|
fcb1029331
|
OB_14.1.1-23 baseline
Former-commit-id: 3cbb39bf6d [formerly b24e7a66d8] [formerly 55918ee421] [formerly 55918ee421 [formerly dcc2e4fd61]] [formerly bc6a7bf946 [formerly 55918ee421 [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: 627ff695c13396d96d30fb35fce57161b70207c9 [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d] [formerly e78e030b7c [formerly 8f72db144b]]
Former-commit-id: e78e030b7c
Former-commit-id: 6c021d0eec
|
2014-03-14 08:18:16 -04:00 |
|
Brad Gonzales
|
e00e32254e
|
Issue #2702 Updated openfire version in component spec.
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498
Former-commit-id: e296297d6d [formerly 57b81b8031] [formerly c7d06ff946] [formerly c7d06ff946 [formerly ccb312d46f]] [formerly bf0d052043 [formerly c7d06ff946 [formerly ccb312d46f] [formerly bf0d052043 [formerly 276c38754b7f917c229750ce06d387a8b63245d4]]]]
Former-commit-id: bf0d052043
Former-commit-id: 6a6279e7a7f820058a9c2a8218857459bc4a47cb [formerly 703b3cf04e5992070f4a2edcfcaf0eac8a3d91d3] [formerly ec34591f08 [formerly dae0963531]]
Former-commit-id: ec34591f08
Former-commit-id: 9dc545e82c
|
2014-03-12 08:48:36 -05:00 |
|
Brad Gonzales
|
7222471fdf
|
Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work
with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.
Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a
Former-commit-id: eff784f257 [formerly f70d572802] [formerly cbac19d219] [formerly cbac19d219 [formerly 09d27e99b5]] [formerly 48b6c75bb3 [formerly cbac19d219 [formerly 09d27e99b5] [formerly 48b6c75bb3 [formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]]]]
Former-commit-id: 48b6c75bb3
Former-commit-id: 0558c80f2a212a2e4805e07ea8ccac3083243623 [formerly 7d3abbb7bdae80a54f033641942cda32bb82bb2a] [formerly f53845738c [formerly 5d5ab33db3]]
Former-commit-id: f53845738c
Former-commit-id: 4e44cdcfd4
|
2014-03-11 11:27:44 -05:00 |
|
Steve Harris
|
b9ff2a49ba
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: d75a4b3cd5 [formerly 865fef97b1] [formerly 51b755a476] [formerly 51b755a476 [formerly 873bd6b889]] [formerly f60aba35d6 [formerly 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: 7f8215da41a95a263a59e77fd7e9353b01be981b [formerly dd4a41540248d59f726530a16fc9cba204845e67] [formerly c24108e75b [formerly 708485427e]]
Former-commit-id: c24108e75b
Former-commit-id: edeb1833ae
|
2014-03-07 15:43:40 -06:00 |
|
Brian.Dyke
|
3e787975d2
|
Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 74d19f707a [formerly e1cc8eb59a] [formerly 0bbf137b05] [formerly 0bbf137b05 [formerly 312cd8a3e8]] [formerly 6414bdab57 [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]]
Former-commit-id: 6414bdab57
Former-commit-id: eb691e30c988ae59a417e5e908b795b25b945453 [formerly 1e0890d0f70a0aeffbbcabd7f8be3e396daae297] [formerly 2eec413d72 [formerly 2f94480121]]
Former-commit-id: 2eec413d72
Former-commit-id: 50621ec3e5
|
2014-03-07 08:57:07 -05:00 |
|
Steve Harris
|
fc1ae80078
|
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 653fb44d87 [formerly 08dbf1f7ea] [formerly dc7d6ceced] [formerly dc7d6ceced [formerly 8b6263bfbd]] [formerly 1c64a5c025 [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]]
Former-commit-id: 1c64a5c025
Former-commit-id: a43476b7803d23c5d5d4c5743c6969b1bf6672b4 [formerly ce9b772480f62374b4f578a3aa3691569ae98b58] [formerly 972fa3bee6 [formerly 7fbbc1e118]]
Former-commit-id: 972fa3bee6
Former-commit-id: 3f778f9f9f
|
2014-03-06 18:31:10 -06:00 |
|
Brian.Dyke
|
433adbce74
|
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: da4afb759b [formerly 8c54df9e0c] [formerly 26fe429c4b] [formerly 26fe429c4b [formerly 1778d20745]] [formerly 010b7a1df5 [formerly 26fe429c4b [formerly 1778d20745] [formerly 010b7a1df5 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]]
Former-commit-id: 010b7a1df5
Former-commit-id: 157d5cb6502d0dd1e7073a9370f666671a0e518a [formerly 0ef04c99b170216a3f24341f708895d2df66d675] [formerly 14844a10b6 [formerly c6dae5a81f]]
Former-commit-id: 14844a10b6
Former-commit-id: df3291e0b4
|
2014-03-06 11:04:34 -05:00 |
|
Brian.Dyke
|
5736be2741
|
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: 6c2229761b [formerly e5972b7159] [formerly 6313b7af0c] [formerly 6313b7af0c [formerly 2dbac1697d]] [formerly cb1b4a7ac5 [formerly 6313b7af0c [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: 38da43ac25d3d18842b31001d43b1cf109c867d1 [formerly 92fbb4b7ccf0b4c7c32f6ac2ac82358fc9c89c38] [formerly 57a28e817d [formerly 3fdb85c62d]]
Former-commit-id: 57a28e817d
Former-commit-id: b2cd2711f9
|
2014-03-06 10:56:44 -05:00 |
|
Steve Harris
|
4cfc6d84a7
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.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.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 06c150bcdd [formerly 52226061e9] [formerly 3ba28aabea] [formerly 3ba28aabea [formerly 069093884f]] [formerly ffcc34f8d4 [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 1fa0e84ac0f2dd8de749139eafb9aa66140436cc [formerly 075449ff82fabd2fc67648dd472bd7d35adee380] [formerly 587f15a95d [formerly 96658d8ce0]]
Former-commit-id: 587f15a95d
Former-commit-id: d2a6b0c18b
|
2014-03-06 08:39:43 -06:00 |
|
Brad Gonzales
|
ffb95634b6
|
Issue #2821 Removed qpid 0.7 from the baseline.
Amend: Removed build.sh script that builds 0.7 and 0.18. changed rpms.sh to call 0.18 build.sh script.
Change-Id: Iaf0cc8c0f9c47877f3e0acc02c60f27b25c0fccf
Former-commit-id: c0deeea120 [formerly bdadb0266b] [formerly f87d4ccf82] [formerly f87d4ccf82 [formerly a007ffabf9]] [formerly 50209c2084 [formerly f87d4ccf82 [formerly a007ffabf9] [formerly 50209c2084 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]]]
Former-commit-id: 50209c2084
Former-commit-id: b50da5828b7fe4bacfcbdf91a0e74a51d709960b [formerly aa3ee588d04acaa851780f26f198fcd5053004bf] [formerly b9affa3c02 [formerly bf3a9ef7fe]]
Former-commit-id: b9affa3c02
Former-commit-id: 0c02861e4e
|
2014-02-28 10:15:18 -06:00 |
|
Richard Peter
|
414ccec00e
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: d17e408d9521d3f82597dba5bf5fbdcd68561d6a [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c] [formerly 50a1b270c5 [formerly f13c86bc3e]]
Former-commit-id: 50a1b270c5
Former-commit-id: 1d6e9816e0
|
2014-02-27 15:18:26 -06:00 |
|
Brian.Dyke
|
45f91b3ede
|
OB_14.1.1-20 baseline
Former-commit-id: 149b4da18b [formerly 2613e13e08] [formerly b2401d2f0d] [formerly b2401d2f0d [formerly 324696c436]] [formerly 2bad40cfee [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]]
Former-commit-id: 2bad40cfee
Former-commit-id: 5a3db29cc415fe26a277c0cb3b27ded295ee4ad8 [formerly ed8e6914deb29235289414c9240bc93a504f11a5] [formerly c873f20d04 [formerly 16117255f3]]
Former-commit-id: c873f20d04
Former-commit-id: 89b66fcb5b
|
2014-02-26 17:39:15 -05:00 |
|
Brad Gonzales
|
46c020f61b
|
Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz. Updated the component.spec to the new version number.
Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3
Former-commit-id: a1c89ad3e0 [formerly e31b98bb85] [formerly 40a653867a] [formerly 40a653867a [formerly 4ccfe4f3c0]] [formerly cf9c22ac99 [formerly 40a653867a [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]]
Former-commit-id: cf9c22ac99
Former-commit-id: c84891f1fa1ae0c83f364553fe0a1da3f86bcfc0 [formerly ba481e4a842a84fed85e94eea66cb8cabf458c52] [formerly 1df77529c3 [formerly a24cbaf683]]
Former-commit-id: 1df77529c3
Former-commit-id: 7c0db7ac7a
|
2014-02-25 14:42:59 -06:00 |
|
Brian.Dyke
|
26b98fb80d
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: af1aec8dde [formerly 9158806dd2] [formerly 363403fb34] [formerly 363403fb34 [formerly 2faab606e5]] [formerly 1a8a0b703e [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 42296588ba3dfa4fcd8427134926b0c727849a35 [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c] [formerly 73a1c238f4 [formerly 227131e5f1]]
Former-commit-id: 73a1c238f4
Former-commit-id: 6b1b6d38e3
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
f8bc18aa5e
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: ae2d13681c [formerly 049424e5f0] [formerly 45ccac0859] [formerly 45ccac0859 [formerly 4364e7497c]] [formerly 2db5f26840 [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: cfe1bb119cb0279993c54f4220010aa750c7fba5 [formerly a242c09c6983c820aa32c052d7deaed21a0982ec] [formerly 7d3af157f8 [formerly 3b2ea2d6ac]]
Former-commit-id: 7d3af157f8
Former-commit-id: 5831f8d79e
|
2014-02-24 13:46:48 -06:00 |
|
Brian.Dyke
|
19d6b57ea2
|
OB_14.1.1-19 baseline
Former-commit-id: 800e8b558a [formerly 3508e488f5] [formerly 779553142c] [formerly 779553142c [formerly cfa4997978]] [formerly 10b723647b [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 6b5bf3c8fb87d2dc67f4593e070f4f3c708f8426 [formerly f52dfb462cf92e04bf51f942fd80bfc621074563] [formerly c41dd22ff2 [formerly 64044e7ce5]]
Former-commit-id: c41dd22ff2
Former-commit-id: 5a11fbbfdb
|
2014-02-21 06:50:59 -05:00 |
|
Brian.Dyke
|
601c4644ca
|
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 4c41a363dc [formerly 45cf129ad7] [formerly 5f3ca0a3f4] [formerly 5f3ca0a3f4 [formerly 2f79cc486e]] [formerly 916f657e04 [formerly 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 916f657e04 [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]]
Former-commit-id: 916f657e04
Former-commit-id: 3c8881ff68e1b111a9abeb0274379796346e67b4 [formerly b55df208e18a858dd848c1f37a3594d57d916867] [formerly 9ce06f52c4 [formerly e36ae1dd7f]]
Former-commit-id: 9ce06f52c4
Former-commit-id: 1fc3b18abb
|
2014-02-20 15:50:50 -05:00 |
|
Ron Anderson
|
6d5b4e33fc
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 70cab4177f [formerly 410f956cff] [formerly e7f2b6883d] [formerly e7f2b6883d [formerly 32bcf9d0d0]] [formerly 14a082a4e9 [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 572fdd2e8ec23449d4870a10516fccf9d12e37ee [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108] [formerly 0135771eec [formerly d4ba9eba94]]
Former-commit-id: 0135771eec
Former-commit-id: 8779564e3a
|
2014-02-18 10:45:20 -06:00 |
|
Brian Clements
|
e9ee0fe33c
|
Issue #2755 removed subscription plugin jar from rpms
Former-commit-id: d11cf2d8c8 [formerly fa44883db0] [formerly 944a874c5b] [formerly 944a874c5b [formerly d4f3fe7629]] [formerly 248db98ddf [formerly 944a874c5b [formerly d4f3fe7629] [formerly 248db98ddf [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]]]
Former-commit-id: 248db98ddf
Former-commit-id: 5dc8b64bfdcac9594937db99f0439d474876c3a7 [formerly 7166a474368c6d544978e9fc3dc6315a0b97411b] [formerly 08bffb26ca [formerly 5faad2ccca]]
Former-commit-id: 08bffb26ca
Former-commit-id: b4f07d06d8
|
2014-02-18 09:00:21 -06:00 |
|
Ron Anderson
|
434d5c4c6c
|
Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 8ef94ea216 [formerly 69ee4792ad] [formerly 3e78908bb5] [formerly 3e78908bb5 [formerly fcf45916f4]] [formerly 2f067699f2 [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: d520f8d08747355126bced1207a4b6b823b314ac [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c] [formerly d9b82b4ebe [formerly 2d7c87ac84]]
Former-commit-id: d9b82b4ebe
Former-commit-id: 4d8ebf6712
|
2014-02-13 10:10:34 -06:00 |
|
Brian.Dyke
|
c465982c29
|
14.1.1-18 baseline
Former-commit-id: 1029a34bfb [formerly 1f27652aa3] [formerly f05a2220cd] [formerly f05a2220cd [formerly 575e328123]] [formerly 1d6a9456b7 [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 673beee0d0b01bc69a4ad14a3a68f869a345e932 [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05] [formerly d61ae6c5f4 [formerly c5857c30f2]]
Former-commit-id: d61ae6c5f4
Former-commit-id: 1c7bf39f73
|
2014-02-11 15:52:50 -05:00 |
|
Brian.Dyke
|
452c7b2424
|
14.1.1-17 baseline
Former-commit-id: fe5caf36c1 [formerly 4c6eb0c001] [formerly f3d34b0c38] [formerly f3d34b0c38 [formerly 180d1356cd]] [formerly 23280af290 [formerly f3d34b0c38 [formerly 180d1356cd] [formerly 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 8d68ea178debd78eef9f0aad72b00cd3050b80b6 [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a] [formerly f1cc9d6ee2 [formerly 947ec5fd96]]
Former-commit-id: f1cc9d6ee2
Former-commit-id: 6e66bb7b6e
|
2014-02-04 12:33:46 -05:00 |
|
Greg Armendariz
|
e07f89f036
|
Issue #2754 - Return commons logging to build for qpid
Former-commit-id: 151f6381e9 [formerly 7481545364] [formerly c70e69147d] [formerly c3450b7aa388488dfcdf604d7c32d2c868fb03b4 [formerly c70e69147d [formerly 6d3e40d648]]] [formerly 976edd2545 [formerly c70e69147d [formerly 6d3e40d648] [formerly 976edd2545 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]]]]
Former-commit-id: 976edd2545
Former-commit-id: 25cdb0ed08bbbd80d76b93c2f1ad32b386b5683a [formerly f7ccb68536836e65517ff864bd975eed46384b48] [formerly b81825a668 [formerly 346d535a6c]]
Former-commit-id: b81825a668
Former-commit-id: df7ce23942
|
2014-01-28 15:06:11 -06:00 |
|
Ron Anderson
|
d49d76954f
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: de5fd8d1f9 [formerly 2e8cbade9f] [formerly 0bde38cef3] [formerly 0bde38cef3 [formerly ba7a25a88f]] [formerly 62c445d872 [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 3c3cb649277ee002582b7c8b0a2575dd02973dd2 [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25] [formerly dca7f21f7b [formerly 624375267e]]
Former-commit-id: dca7f21f7b
Former-commit-id: 46735c9afe
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
1d34377f08
|
14.1.1-15 baseline
Former-commit-id: a1f3c9ede6 [formerly c6cb11a5f4] [formerly f88ff2bde9] [formerly f88ff2bde9 [formerly 8bbd803ace]] [formerly d8e5799328 [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 6c71806486b1f0fba757d79ff9884fb36e1d4aa4 [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07] [formerly 282d10fe6d [formerly 35d8f5a281]]
Former-commit-id: 282d10fe6d
Former-commit-id: 188b12a1b0
|
2014-01-06 14:08:08 -05:00 |
|
Richard Peter
|
fc48645209
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: 5064a5d2a6 [formerly cc89b16338] [formerly e4f59ea119] [formerly e4f59ea119 [formerly 1de516964b]] [formerly 2e7fd9ddba [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 54bd5e23164e1f87fd36f5190406559c896da0f9 [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3] [formerly 5c0cf804f1 [formerly 62fa535744]]
Former-commit-id: 5c0cf804f1
Former-commit-id: 73f12bf669
|
2013-12-17 21:04:53 -06:00 |
|
Greg Armendariz
|
9b38c01e91
|
Issue #2182 - Change release number
Former-commit-id: 3d0a54d32c [formerly 7219a81337] [formerly 00fd9a7bc5] [formerly 00fd9a7bc5 [formerly 85703b9919]] [formerly e994e19877 [formerly 00fd9a7bc5 [formerly 85703b9919] [formerly e994e19877 [formerly f9b49df162e36376f96897db77e0504cba87f28a]]]]
Former-commit-id: e994e19877
Former-commit-id: 80b99670ad7a196d7d6ea58c64a2ba8dfdae7920 [formerly 02329498e90a03be29ba695e53af3906d56dfb9d] [formerly e190469fc1 [formerly fad73466a7]]
Former-commit-id: e190469fc1
Former-commit-id: e2da5b7daa
|
2013-12-17 08:46:15 -06:00 |
|
Bryan Kowal
|
f46ef1a45d
|
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: bb96219277 [formerly b2550c873b] [formerly 0c3b22c8f2] [formerly 0c3b22c8f2 [formerly 43008f4698]] [formerly 120ebd045a [formerly 0c3b22c8f2 [formerly 43008f4698] [formerly 120ebd045a [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: 6db02b3505f9d667ed4f180e2a7adf232dea1ac2 [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851] [formerly 68181d3f62 [formerly fac9d72cc8]]
Former-commit-id: 68181d3f62
Former-commit-id: a63bda59b4
|
2013-12-16 16:39:10 -06:00 |
|
Steve Harris
|
0be3454c99
|
14.1.1-13 baseline
Former-commit-id: b604d6f343 [formerly a2ae393ec1] [formerly 85eebac7e2] [formerly 85eebac7e2 [formerly c88b10039a]] [formerly b0b55a676b [formerly 85eebac7e2 [formerly c88b10039a] [formerly b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: e61453c51d647c99867d81af4886534e0b1f1311 [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee] [formerly 5368f23247 [formerly 61d4adc979]]
Former-commit-id: 5368f23247
Former-commit-id: 690b177ded
|
2013-12-12 16:59:57 -05:00 |
|