Nate Jensen
|
2df8a30b14
|
Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly 7e3a38d473 [formerly 5fcc126e57] [formerly e6569b4a7d] [formerly bb32858c04 [formerly e6569b4a7d [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]]
Former-commit-id: bb32858c04
Former-commit-id: b4747e1967 [formerly 651ce74777] [formerly 1c3c85d7dc8e6b4c5d374cb39021ba2a71dac98c [formerly 5d08184312]]
Former-commit-id: 1ecaca6a168a620d74a23e94527430feab94ee01 [formerly 9713ae6bf1]
Former-commit-id: 064894fe59
|
2014-05-09 16:45:39 -05:00 |
|
Steve Harris
|
a7c453801c
|
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly ff4a6b8122 [formerly ce2b030743 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]]
Former-commit-id: ff4a6b8122
Former-commit-id: bfd8f9b971 [formerly 532b861bce] [formerly 12b7c2d1dfdafd204880707993afeebf47eefe41 [formerly 988ad59a0d]]
Former-commit-id: 14bc990e4d26f4fcba9b4f047441d279289dbc89 [formerly 47991060bb]
Former-commit-id: 77030c2fc3
|
2014-05-08 09:50:34 -05:00 |
|
Steve Harris
|
36a5745de6
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
Former-commit-id: 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly b7a1bda98c [formerly e37e40ed19 [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]]
Former-commit-id: b7a1bda98c
Former-commit-id: f1032ccc05 [formerly 7a7c1167c2] [formerly d3c134610c7a2e642c723287f1d8135b292eb22c [formerly 9591532ffd]]
Former-commit-id: fab7d30fa99a5cbb15284899c9cda059f1e07992 [formerly 049716e54d]
Former-commit-id: 2b29fec8d6
|
2014-05-07 16:01:53 -05:00 |
|
Nate Jensen
|
e98ed9042a
|
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly e93e248f9a [formerly daac0701fc] [formerly d271dfb1a5] [formerly 0f1cab916a [formerly d271dfb1a5 [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 1adf6d304f [formerly 89621db281] [formerly 47226b181942be9b2bff4189674708a517376408 [formerly 70f70371b1]]
Former-commit-id: 2f4818061c868c793957c6720b9ab0b1d1c1a29f [formerly 12f88d14bf]
Former-commit-id: 76750c319a
|
2014-05-06 17:09:56 -05:00 |
|
Ben Steffensmeier
|
41fead7d98
|
Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 34c4ce1630 [formerly e70a6999b7] [formerly bbbf957ba8] [formerly 70df0ee87e [formerly bbbf957ba8 [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]]
Former-commit-id: 70df0ee87e
Former-commit-id: c83559ee61 [formerly 81916ecdb6] [formerly 4e4ce9614076e1c738d79e3feab9658310edbcb5 [formerly 945fe1db2f]]
Former-commit-id: 0e99b439ffe3cb3eb47009242d3ff465ec38fa5e [formerly a39b05ac71]
Former-commit-id: b978e0fc1d
|
2014-05-06 16:19:58 -05:00 |
|
Nate Jensen
|
fb64a8684f
|
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 0b046a18e1 [formerly 26f47e3b00] [formerly a583493711] [formerly 0b046a18e1 [formerly 26f47e3b00] [formerly a583493711] [formerly 8f8ea5d014 [formerly a583493711 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: baf8e4a3ea [formerly 4f3570324a] [formerly 532ed751ce54ccf8c69036528d3a9d6ed5bdb7dd [formerly f1c48f10b1]]
Former-commit-id: 7e9a62127f91ff74917a295a5da19fae49aff58f [formerly a20245a64d]
Former-commit-id: 3aa1481c98
|
2014-05-06 16:15:41 -05:00 |
|
Nate Jensen
|
8a31b5edf5
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]]
Former-commit-id: 7cea97ab15
Former-commit-id: e8ca9729eb [formerly 5bf1554597] [formerly 4cf3887df369f38b75f0a2c9f9f7949057e50e42 [formerly 6bdbfb7e1a]]
Former-commit-id: 0fc7bbac68e600996cc014bbf843e66d5484e6e9 [formerly 66cd43313a]
Former-commit-id: ad7a69f2e3
|
2014-05-06 12:26:21 -05:00 |
|
Brian Clements
|
8bb6a1ac40
|
Issue #3076 added clear all to shared display sessions
Former-commit-id: 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]]
Former-commit-id: 1432aa1302
Former-commit-id: 0fbb5dc22a [formerly 8674841154] [formerly bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b]]
Former-commit-id: db57e64f5cb253ecb97388555bf76c0cac27eaf9 [formerly 3a60b0db05]
Former-commit-id: 89f3a0a1d2
|
2014-05-06 09:30:07 -05:00 |
|
Nate Jensen
|
83f9d6e4e9
|
Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
Former-commit-id: c07a4c0069 [formerly db4fc0c4d2] [formerly 7d11e31b06] [formerly c07a4c0069 [formerly db4fc0c4d2] [formerly 7d11e31b06] [formerly 596b5268d0 [formerly 7d11e31b06 [formerly dee25d151cecf83f23d2ef9df20146c68069e957]]]]
Former-commit-id: 596b5268d0
Former-commit-id: 7cec722176 [formerly bff03681a4] [formerly a4dee39f1add48e8c979182cd8f3f9ee04f952a5 [formerly bad26fdd7d]]
Former-commit-id: 559d76fcf8298b702f134557f213fd1dd0db1c11 [formerly 7e521c3e0b]
Former-commit-id: c32e1bb9fe
|
2014-05-05 16:58:44 -05:00 |
|
Lee Venable
|
4a44bbed48
|
Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: a57f0e338d [formerly 550668cbf7] [formerly a6c2260dd1] [formerly a57f0e338d [formerly 550668cbf7] [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly a6c2260dd1 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a8864844bb [formerly a092fd45dc] [formerly 99c525ad61eed1107476ce09523a10adfb16b511 [formerly 631a8d3cb1]]
Former-commit-id: d050d7aa9271504d20368a3a4fa3054d4a97cc2d [formerly f48d571cb6]
Former-commit-id: 46eb74e982
|
2014-05-05 16:13:31 -05:00 |
|
Steve Harris
|
3eb4392746
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (updated in ufcore):
cave/com.raytheon.uf.viz.application.feature/feature.xml
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: dd01a4282b [formerly a8d3f4d885] [formerly 73ed3251bd] [formerly dd01a4282b [formerly a8d3f4d885] [formerly 73ed3251bd] [formerly 83368e4b4e [formerly 73ed3251bd [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]]
Former-commit-id: 83368e4b4e
Former-commit-id: 7245029570 [formerly ea24d1dadc] [formerly 2b3b76c82538d382ce6a14c9e014860eb6ff65e2 [formerly caadbd3dd9]]
Former-commit-id: df9b11e0eb39b9514f40f87773a3af9916ea3bf3 [formerly 8cd5ed7a8e]
Former-commit-id: b8b5300a9b
|
2014-05-05 16:04:09 -05:00 |
|
Brian Clements
|
eae39a09dd
|
Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: 46b526473d [formerly dec5159216] [formerly 1502354f87] [formerly 46b526473d [formerly dec5159216] [formerly 1502354f87] [formerly c61e30a422 [formerly 1502354f87 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]]]
Former-commit-id: c61e30a422
Former-commit-id: 89fbf5f2bc [formerly 9d25e9dcb8] [formerly 0a74f9c3259a55c56b2763cb02f26aae56e52755 [formerly 58f45fa7d0]]
Former-commit-id: f75d4b4a4fb7e74481dd87fffc4dde55585c4782 [formerly 1e3d29a3f3]
Former-commit-id: 9c7f4cd887
|
2014-05-05 15:29:06 -05:00 |
|
Dave Hladky
|
766d9f09a7
|
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]]
Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97]
Former-commit-id: 7e763a5a22
|
2014-05-05 12:15:14 -05:00 |
|
Nate Jensen
|
ef530e538d
|
Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly d6518bede1 [formerly e9b3041170 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]]
Former-commit-id: d6518bede1
Former-commit-id: dcbedcbbc0 [formerly e8e971d434] [formerly bd03fd08ecba17789cb90578917e1a4d7b88234a [formerly 8ee8937daf]]
Former-commit-id: 691f6074396a107be1d2cd9bbea9d5f5ba7b2d31 [formerly e8b7cec960]
Former-commit-id: 3eaaf56f8e
|
2014-05-05 09:45:11 -05:00 |
|
Richard Peter
|
6b93ff149a
|
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly d4a138c534 [formerly 478cedd3a3 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]]
Former-commit-id: d4a138c534
Former-commit-id: 4537e1276f [formerly 160ce06137] [formerly ca0cfca3ed26cc4f000b74ac3d1f482f80140ed2 [formerly 1b7dd13525]]
Former-commit-id: 1d7a263d7bb684e35dafbb6c76df324cb708edde [formerly 67eb0867ea]
Former-commit-id: 7481634fdb
|
2014-05-02 09:50:40 -05:00 |
|
Richard Peter
|
711be53fea
|
Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly 36d579c206 [formerly 1738b065b8] [formerly a9b088146c] [formerly bcd87195ee [formerly a9b088146c [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]]
Former-commit-id: bcd87195ee
Former-commit-id: 2d597d61ab [formerly 926cd5f6d1] [formerly 3fa1d18ae07b1ff8c4ffc4b83cd39952d11ded1d [formerly e1a2767f8f]]
Former-commit-id: 4fe9ed9b053941aaa7d97f487449c7e8441c5f10 [formerly df422d1516]
Former-commit-id: 338b2c53d0
|
2014-05-01 16:30:21 -05:00 |
|
Nate Jensen
|
2b6ad3264c
|
Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 9f08442039 [formerly 6f211aa9f8] [formerly fb99f58ad5a7cfb43ae453f0c000e943ba999928 [formerly f3b68178bd]]
Former-commit-id: 930f4906645edbcafbe567a1652cb392d52f18a5 [formerly 3f9a33bf35]
Former-commit-id: 42a27546f9
|
2014-05-01 16:28:16 -05:00 |
|
Nate Jensen
|
e2a024ea00
|
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly a73a310709 [formerly 137818d03a [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]]
Former-commit-id: a73a310709
Former-commit-id: 834dd4895a [formerly b245e49d53] [formerly 61860d514df7120cc0bb0d8c083c115b3944aa73 [formerly 84dbedcff5]]
Former-commit-id: 48dea045c9df8e5f4f88eaca3f0e152ddc64138d [formerly c7ddb6d476]
Former-commit-id: 562a70b8fb
|
2014-05-01 16:20:35 -05:00 |
|
Richard Peter
|
d2682acaf2
|
Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 4056f53fa2 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]]
Former-commit-id: a4fb460e17
Former-commit-id: 3297632b5d [formerly f364f02f58] [formerly 38c78f7ac3ebdff8190b01723125c22a2058c85f [formerly c3c7ebb146]]
Former-commit-id: 7a8980241b9c8931fec2ce1f756924532831bd95 [formerly 472077fbd5]
Former-commit-id: b8bdced87a
|
2014-05-01 14:47:41 -05:00 |
|
Steve Harris
|
059faff023
|
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a268173ac [formerly 9a6ab8c52f] [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be]]
Former-commit-id: 787bb8f6beeae504adb25f278d73dbfbb74159fb [formerly d7c31fe4a9]
Former-commit-id: 523cf536e2
|
2014-05-01 13:25:15 -05:00 |
|
Brian Clements
|
de694643a9
|
Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 8fc0feed89 [formerly 3fd504f1de] [formerly f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56]]
Former-commit-id: e46f09623a9e504ef25b49b889bf64a2c46ca4bb [formerly c7cea4b5f7]
Former-commit-id: 36b2419ff1
|
2014-05-01 12:34:09 -05:00 |
|
Brian Clements
|
542b75e5be
|
Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help
Former-commit-id: fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly f45e435f2c [formerly 873efa1c64 [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]]
Former-commit-id: f45e435f2c
Former-commit-id: 00e7061f42 [formerly 20830253ba] [formerly f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782]]
Former-commit-id: 1a699056f312f4be2eb1ef65d741ba8d01a416f7 [formerly c3d2b4be86]
Former-commit-id: 4c1a6b44c8
|
2014-04-30 17:52:43 -05:00 |
|
Richard Peter
|
68474fb70c
|
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 86ddd480c1 [formerly de9eb60629 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 9ee5b7c648 [formerly d961ff6edc] [formerly 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6]]
Former-commit-id: f6db2a6fbbc579ddd2e876bdea84339cafc85568 [formerly dd54408a10]
Former-commit-id: cfb980db11
|
2014-04-30 17:43:50 -05:00 |
|
Dave Hladky
|
5fa53b22dc
|
Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly 3b00ae03cc [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 5fc17cf3b8 [formerly ea791b5ca5] [formerly 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740]]
Former-commit-id: 966b34bc10a6cb76f151b577b0acae7fb953d804 [formerly 5b11e45636]
Former-commit-id: a06db5a4e7
|
2014-04-30 17:38:28 -05:00 |
|
Richard Peter
|
7dbdba81ac
|
Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly f80e16d0c9 [formerly 31d75a4b82413b015353055668defab0095ef893]]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: 307a149bea [formerly f2d07ce35c] [formerly e3670bef923e89a1f5a7985176c384fe933c5958 [formerly 8ddc4eaffd]]
Former-commit-id: e544947f2f7406e11c3bbafca5f51212bcd4decb [formerly 5d18fbe5d3]
Former-commit-id: fe5fe5b587
|
2014-04-30 14:49:24 -05:00 |
|
Steve Harris
|
eec112e4b2
|
Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core
Former-commit-id: 5845200789 [formerly 31f17bbb51] [formerly b7272b3248] [formerly 5845200789 [formerly 31f17bbb51] [formerly b7272b3248] [formerly 1eb121595d [formerly b7272b3248 [formerly 839a926dca01566419409138e9810f14e0e46b84]]]]
Former-commit-id: 1eb121595d
Former-commit-id: 2f14898fec [formerly a659f2bf1d] [formerly c0924bd1b1572c832d85f3f1e15e466728edca26 [formerly 88a7777e79]]
Former-commit-id: 9705b5637307e58b21d30c400b1ff41195e1224f [formerly 2eed016efd]
Former-commit-id: ae6eed5e0a
|
2014-04-30 13:59:33 -05:00 |
|
Nate Jensen
|
a11f0d304c
|
Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 8cbea21f32 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 65ad418a94 [formerly 9a2c674142] [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac]]
Former-commit-id: 3b5d2fc28c192ce41c0bfe1d25e5582a85ee8e04 [formerly 58618a1842]
Former-commit-id: eb5dd811ca
|
2014-04-30 13:08:26 -05:00 |
|
Brian.Dyke
|
f4856aae4d
|
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
|
2014-04-30 12:57:09 -04:00 |
|
Steve Harris
|
64492a05dc
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.auth/build.properties
edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.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/StatsDao.java
Former-commit-id: 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 5a3c6a11c2 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 103318357b [formerly 6ad5b5a9d7] [formerly ba5d0a9ff7373ccedcbbb73791d2d7a098c2ff8e [formerly f168d3dddb]]
Former-commit-id: 8ccde1991c055590b9341bfb6729666eea087e32 [formerly 98b93e364e]
Former-commit-id: d214c3174d
|
2014-04-30 11:22:22 -05:00 |
|
Steve Harris
|
66ee7213aa
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
Conflicts (these are now in ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
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.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
Former-commit-id: 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly af7fb01f53 [formerly 396daac383 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]]
Former-commit-id: af7fb01f53
Former-commit-id: bb335fd675 [formerly 9b65077ad9] [formerly aeb0a11344f6daaf21e2b40c8bb422f483add825 [formerly 225da706b7]]
Former-commit-id: 0e3911d76550ba99a7aa266f7b2ddff9d81644f3 [formerly 04f12dbaca]
Former-commit-id: 8860d8e6e7
|
2014-04-29 16:09:07 -05:00 |
|
Brian.Dyke
|
2e187af9e4
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
|
2014-04-29 12:07:21 -04:00 |
|
Richard Peter
|
e748b7c1e5
|
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: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Steve Harris
|
a0d412c9d1
|
Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2
Former-commit-id: 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly c4597ec58b [formerly 7b56fb23a8 [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]]]
Former-commit-id: c4597ec58b
Former-commit-id: 1266b9438f [formerly 9ef44d2a4c] [formerly 21bcb7ea12e3aa6614573b6302c5937f0be904d4 [formerly 7c44a9506c]]
Former-commit-id: 5539a63dbf2d0f395168e771e37c63ed6f8c5480 [formerly 983efa8dd3]
Former-commit-id: 567730e595
|
2014-04-28 16:25:21 -05:00 |
|
Lee Venable
|
b011f13fb1
|
Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly e054a7ab98 [formerly 573465f316 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]]
Former-commit-id: e054a7ab98
Former-commit-id: 090ea0fa5a [formerly eda26e6076] [formerly d8e463c70dce54bf7b40b1d218bccb587c3b88e6 [formerly 43fdbe9ab6]]
Former-commit-id: a4e6f79e43287a75219721e1af377b8859a3b82e [formerly ede8740acc]
Former-commit-id: 3a133f6626
|
2014-04-28 15:24:26 -05:00 |
|
Ben Steffensmeier
|
9980eb1eb1
|
Issue #2947 ensure consistent interpolation levels for derived satellite.
Former-commit-id: f4744737e4 [formerly 41b0c1a3c8] [formerly 812eebdd72] [formerly f4744737e4 [formerly 41b0c1a3c8] [formerly 812eebdd72] [formerly f318c9eb62 [formerly 812eebdd72 [formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]]
Former-commit-id: f318c9eb62
Former-commit-id: e9bc29a18e [formerly bb562c9755] [formerly 78b9fa75af2953ddce6bfad5265e177fb5696833 [formerly 868945fb1b]]
Former-commit-id: d9fda2331fa5824648a44fe1daf5e0b77e37a03d [formerly 40e3df3ba1]
Former-commit-id: c59046cda1
|
2014-04-28 13:00:39 -05:00 |
|
Steve Harris
|
47be791233
|
Omaha #3085 - Removed ufcore and ufcore-foss plugins
Former-commit-id: 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 491b768204 [formerly a89621797d [formerly 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca]]]]
Former-commit-id: 491b768204
Former-commit-id: 1e989b1639 [formerly 558686f2fd] [formerly 85fa8d3f761f8d88d8e3d58caaba110e85d03595 [formerly 23e542e36b]]
Former-commit-id: 1ddc49314076d4b7f8cc758bd55e27897368ca0a [formerly b19a9c9aa8]
Former-commit-id: dd3da741ef
|
2014-04-28 09:59:23 -05:00 |
|
Nate Jensen
|
5ad4b4430f
|
Merge "Issue #2972 fix thin client startup" into development
Former-commit-id: 99612f1324 [formerly d145961f4c] [formerly 48cab0ae71] [formerly 99612f1324 [formerly d145961f4c] [formerly 48cab0ae71] [formerly dc3ba942a9 [formerly 48cab0ae71 [formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]]
Former-commit-id: dc3ba942a9
Former-commit-id: 8830b4dc71 [formerly 74e77d307a] [formerly e4462ad10f15d550cf3f5675a21220838cb4c684 [formerly 11a3ae5054]]
Former-commit-id: f5b7bcc5cc48a601ee19bd22cfeff91d7968b363 [formerly 195db736e8]
Former-commit-id: d2bfcfa53b
|
2014-04-25 15:05:07 -05:00 |
|
Nate Jensen
|
c720e2aae7
|
Issue #2972 fix thin client startup
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4
Former-commit-id: f007819a3b [formerly 7811040f3e] [formerly d47a09530a] [formerly f007819a3b [formerly 7811040f3e] [formerly d47a09530a] [formerly 86e9502341 [formerly d47a09530a [formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]]
Former-commit-id: 86e9502341
Former-commit-id: c7a6389dc5 [formerly c802e6a05c] [formerly e06610b8bc72529769fa8960a6b7198bd30c2095 [formerly 27ed7e5dab]]
Former-commit-id: 8c93b8803ebf8badcca85d808ea826377574c911 [formerly ce3c2c1341]
Former-commit-id: 4b6db92b9f
|
2014-04-25 14:42:07 -05:00 |
|
Ben Steffensmeier
|
d6eadfc34c
|
Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 2d96d9d2df [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 5b61473bd6 [formerly 080c2a48f3] [formerly 5a00a4836af355759bf8bd0c0ffa79adcb056d6b [formerly 7499987f52]]
Former-commit-id: 57669c24cddfb753d969f18626729fa9ecf6418f [formerly 86174019b5]
Former-commit-id: 1bb8ce2cbe
|
2014-04-25 14:38:36 -05:00 |
|
Brian Clements
|
52e575f833
|
Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 1dc13cc151 [formerly 5f746c9c56] [formerly 17ab4f6184] [formerly 1dc13cc151 [formerly 5f746c9c56] [formerly 17ab4f6184] [formerly f1213c1bda [formerly 17ab4f6184 [formerly 57120491452b36bf15227bd4b6d0236221c71124]]]]
Former-commit-id: f1213c1bda
Former-commit-id: 922d56617f [formerly ed2d66a6fa] [formerly d5d66283e23493ee2ad0d94aaa29c13df24989de [formerly fe6af8c315]]
Former-commit-id: d581af1f7d2638e596a708f8133e8ab2cb129ea5 [formerly edaaa9a426]
Former-commit-id: eb318a9a0d
|
2014-04-25 13:41:17 -05:00 |
|
David Gillingham
|
b68680eb65
|
Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb
Former-commit-id: 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 2426e463f7 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 8db5524b3f [formerly 48bc49fd4b] [formerly cc410719114014fd14ea4e485ad8351678818e80 [formerly 2e8b8c6e86]]
Former-commit-id: c46af48dc3a4136893d9194d27b43b98838b448d [formerly c0fd32360d]
Former-commit-id: 83674f8444
|
2014-04-25 10:56:43 -05:00 |
|
Brian.Dyke
|
19b4bb7dcc
|
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: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
|
2014-04-25 11:06:11 -04:00 |
|
Richard Peter
|
a32345d1cb
|
Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: ee59a298eb [formerly 5b14b22ee1] [formerly 37342cba87] [formerly ee59a298eb [formerly 5b14b22ee1] [formerly 37342cba87] [formerly 9a7e1aa9b0 [formerly 37342cba87 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: d8950196fa [formerly 2d1262e41f] [formerly 0442d2b0ea886a8fa3e51c518e72f6a8bad19366 [formerly caccf6ca52]]
Former-commit-id: 4bd4b3b5852acfa88c28932b1c603be585f53bb9 [formerly b234142252]
Former-commit-id: dcd2468bee
|
2014-04-24 19:11:50 -05:00 |
|
Lee Venable
|
25612cea42
|
Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
Former-commit-id: 4583301be4 [formerly 15c9311c97] [formerly a511f8d4e7] [formerly 4583301be4 [formerly 15c9311c97] [formerly a511f8d4e7] [formerly e7acb04432 [formerly a511f8d4e7 [formerly 9762326cea40526042cd7f371d864a96abd63842]]]]
Former-commit-id: e7acb04432
Former-commit-id: ae2a0c44df [formerly ae333a34dc] [formerly 354ff82939ff9af3bda0b0549c79621918a220c7 [formerly 20d563cd15]]
Former-commit-id: b87ed90d9dad9a8dfa6ac58452d6f27ef01b616e [formerly 40e1bbc5f1]
Former-commit-id: 9bbc3844f9
|
2014-04-24 17:53:05 -05:00 |
|
Lee Venable
|
022d1ff834
|
Merge "Issue #3045 Change column label to "Data Set"." into development
Former-commit-id: e35e76282f [formerly fd7a86e187] [formerly e45c999d47] [formerly e35e76282f [formerly fd7a86e187] [formerly e45c999d47] [formerly 9642dac1f1 [formerly e45c999d47 [formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]]
Former-commit-id: 9642dac1f1
Former-commit-id: cd5d582898 [formerly 059a2f59b5] [formerly 4d167b8c2ca353a3b73426a8094c1a1a3ce6b803 [formerly e776e8c3d0]]
Former-commit-id: 78c5416a7d70a9ecc41cd9e73d3b25e14e8552d2 [formerly 890891c1b5]
Former-commit-id: 70465fb1bd
|
2014-04-24 17:42:12 -05:00 |
|
Roger Ferrel
|
541ee5a81d
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: dd679c7978 [formerly 8eb4c91ab3] [formerly 3a2a6afaf1] [formerly dd679c7978 [formerly 8eb4c91ab3] [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly 3a2a6afaf1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: f88302b94d [formerly 555c8cf617] [formerly 675b98f9712eaa32b9b8d18b880b9cabd81a288f [formerly 0490023b2c]]
Former-commit-id: e456e77496a0301296471813c64c0022c292f98e [formerly 3d744452af]
Former-commit-id: 0ece281810
|
2014-04-24 16:25:01 -05:00 |
|
Brian Clements
|
d3813b0f96
|
Issue #3070 fixed contact request handling
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with
Former-commit-id: 345fe6f866 [formerly 334ad3ca81] [formerly 02f08d75c6] [formerly 345fe6f866 [formerly 334ad3ca81] [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]]
Former-commit-id: 94aa761e19
Former-commit-id: 32b8ddd64c [formerly 84f75ca30a] [formerly 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8]]
Former-commit-id: 7d1e4b70e650e3930f0ba2b7d95a341ff827b93d [formerly c27f2d9e53]
Former-commit-id: 670c4e1611
|
2014-04-24 16:10:27 -05:00 |
|
Roger Ferrel
|
457ae58495
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: dd86b04686 [formerly e2b03eb190] [formerly 9dad4c959b] [formerly dd86b04686 [formerly e2b03eb190] [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 9dad4c959b [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: b511341dc4 [formerly ef81949dd1] [formerly 54b732727c2263f33c97df4d4d5ff55d84b6f396 [formerly d73f61c7e7]]
Former-commit-id: 61c965fb5391ac0a0e33f1f1fed5bd390ebde6eb [formerly ca30aa6b8a]
Former-commit-id: 5fda70501e
|
2014-04-24 14:48:15 -05:00 |
|
Slav Korolev
|
d5438ccac5
|
Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
Former-commit-id: f39c9c151d [formerly 150a132320] [formerly 689930c484] [formerly f39c9c151d [formerly 150a132320] [formerly 689930c484] [formerly f458f75ecf [formerly 689930c484 [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]]
Former-commit-id: f458f75ecf
Former-commit-id: 4dca796283 [formerly 27095ecca8] [formerly 72ea0b9194f024a8e7ff25eef75d71cd7b0f041d [formerly e78c6edb8c]]
Former-commit-id: 8dff33928d12bb7f6066533d4e9a0cc09195cf1f [formerly 1bf6d72572]
Former-commit-id: cd38f3636d
|
2014-04-24 15:40:52 -04:00 |
|
Brian Clements
|
88c8e3be8e
|
Issue #2955 ignore duplicate session invites
Former-commit-id: 9f18c5d54c [formerly e81ee94171] [formerly f888819646] [formerly 9f18c5d54c [formerly e81ee94171] [formerly f888819646] [formerly 4fa9afc9ae [formerly f888819646 [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 363632479a [formerly 39c2a1ac37] [formerly 8ac39537a1c44d7ebe4df3667107708e5209338d [formerly 75465b69ed]]
Former-commit-id: 729b6df5f19a32c2faab5eaeae7c9625470cf031 [formerly 3b96c4c628]
Former-commit-id: 9e2497714b
|
2014-04-24 09:25:54 -05:00 |
|