Nate Jensen
4ba024f9fa
Omaha #3133 remove dead activemq code
...
Change-Id: I1a28b58241bd219f59749328cd23b5abd26bf903
Former-commit-id: 8a004c4a9b
[formerly c0df19a1fe
] [formerly e62c36aeb8
] [formerly 3ecf1e8a0a
[formerly e62c36aeb8
[formerly eaf4ec9916a706d1ea3c5e5968557b777c2bc936]]]
Former-commit-id: 3ecf1e8a0a
Former-commit-id: 84af0cec7ac1476b58779ca5182e8103904c649d [formerly c9b18b44bf
]
Former-commit-id: ab53488488
2014-05-13 14:02:21 -05:00
Nate Jensen
a057e5389c
Omaha #3133 remove edex dependencies from common.monitor plugin
...
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: ec4768ed4b
[formerly 88535c69f5
] [formerly cc86f19bad
] [formerly b05630b171
[formerly cc86f19bad
[formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]
Former-commit-id: b05630b171
Former-commit-id: b39b5e72eb5dbb60bd6eb1dd766f167f0f6d7044 [formerly 3aff81313f
]
Former-commit-id: 5d099a3b4b
2014-05-12 16:46:06 -05:00
Steve Harris
21d4fd737c
Omaha #3132 - merge omaha_14.3.1 into omaha_14.4.1
...
Former-commit-id: 9bdd47b352
[formerly 0ee182ad6f
] [formerly e955496335
] [formerly 4d1b6ddc00
[formerly e955496335
[formerly de217b0bd6bbf72ea138f9bc1286992d43d72ef1]]]
Former-commit-id: 4d1b6ddc00
Former-commit-id: fd76fb12bdeec24798c2ed49ce6427f94d766cc0 [formerly 233bc14114
]
Former-commit-id: fe671df079
2014-05-12 15:37:43 -05:00
Richard Peter
52638d1ed1
Merge "Omaha #3133 remove incorrect dependencies" into omaha_14.4.1
...
Former-commit-id: 6f20be9eb9
[formerly 2f186a7789
] [formerly c3ed3b97b8
] [formerly b7a0429580
[formerly c3ed3b97b8
[formerly a79d57e86958129b210d13d301b2dc9c1c80f53e]]]
Former-commit-id: b7a0429580
Former-commit-id: 19fa6aa6d77e2f36139363870ef22ca120234137 [formerly e36d6eaf3a
]
Former-commit-id: 3b0542427c
2014-05-12 15:28:46 -05:00
Nate Jensen
02184e5ad4
Omaha #3133 remove incorrect dependencies
...
Change-Id: Iadccd506bb3fd1f009efeda82193138088a2895f
Former-commit-id: 201c21929d
[formerly 8137d27223
] [formerly 2d32999655
] [formerly d2f86668df
[formerly 2d32999655
[formerly 6db290e14df962d91174727b027b0c5afc1ed0ce]]]
Former-commit-id: d2f86668df
Former-commit-id: a79d24d3bf3e4d0985ec5cb7dba485d7deac944f [formerly 559993eaf9
]
Former-commit-id: 3262ff511d
2014-05-12 15:21:08 -05:00
Nate Jensen
ac044051c1
Omaha #3133 remove some unnecessary edex dependencies
...
Change-Id: I91f10fb36ecadf8e2fc830b135b5d245830417a2
Former-commit-id: be81c7cfc2
[formerly 719014f89a
] [formerly 15329c6b03
] [formerly 54dbc0ef71
[formerly 15329c6b03
[formerly 846003056f07ef205f59c7b043a31a4fa66e5977]]]
Former-commit-id: 54dbc0ef71
Former-commit-id: 7260996a09ae3b4fe6a33660daff25f0823c0bb9 [formerly 2bb07cddf0
]
Former-commit-id: 7d417bb6b5
2014-05-12 15:07:46 -05:00
Steve Harris
7f7e8e69a4
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
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: 856f5bc3b7
[formerly b3bc71c8a4
] [formerly 652fb19bc4
] [formerly 6964df0664
[formerly 652fb19bc4
[formerly a20833879f1a0434c562a22a874b1e1722278954]]]
Former-commit-id: 6964df0664
Former-commit-id: 9655787e1bc6f95e4e9dab9054aa147d706bdd37 [formerly 661eceea83
]
Former-commit-id: 77b2da7a4f
2014-05-12 15:05:43 -05:00
Richard Peter
e7d80f7c67
Issue #3154 : Remove stats reclaimSpace call
...
Change-Id: I32fb957e236f257e5d8164833d2d2c1adf1fa639
Former-commit-id: a661a16f01
[formerly a077fd9cc6
] [formerly fae9e811fb
] [formerly 5648e27bbc
[formerly fae9e811fb
[formerly 4e35d1fa5e3e1ebaa5d177d95a5eb11741ae57d2]]]
Former-commit-id: 5648e27bbc
Former-commit-id: f56db3df561a3729a49b418c7643ed5a2924b76f [formerly f53d5ba7e9
]
Former-commit-id: 87bb7ac342
2014-05-12 12:27:32 -05:00
Brian Clements
bc2ac0198b
Omaha #3152 removed monitorsrv
...
jmx plugin that is currently not used and required dependency maintenance
Former-commit-id: 083b68d7b4
[formerly 2de644c9e3
] [formerly 87aa26bf5a
] [formerly ed8b9f5a89
[formerly 87aa26bf5a
[formerly 7a00a651afb1c4251b52a852b01696cc861640be]]]
Former-commit-id: ed8b9f5a89
Former-commit-id: e2220ff9eabf1270c1ef05bef631dcc980ffdf3f [formerly b75243d000
]
Former-commit-id: 7d9eaa94c5
2014-05-12 12:13:28 -05:00
Brian Clements
26064a9629
Omaha #2733 changes to match ufcore distribution pattern changes
...
this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns
Former-commit-id: 4d2d5f81df
[formerly 243ba8476a
] [formerly 8b07016f25
] [formerly 316bfe3b6f
[formerly 8b07016f25
[formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]]
Former-commit-id: 316bfe3b6f
Former-commit-id: fbf8cffad16b3edb70ad15a4742dcdc5c87e748c [formerly 9cc5ee88b5
]
Former-commit-id: 546cf300df
2014-05-12 09:14:28 -05:00
Nate Jensen
8bc0acc137
Merge "Issue #2928 : Increase default thriftService byte limit to 250MB" into omaha_14.3.1
...
Former-commit-id: ab17f8b84e
[formerly ed687984f7
] [formerly 486c69045d
] [formerly 5849925092
[formerly 486c69045d
[formerly dac16ee8f25f6f265426405ca2bff55aff5b57ba]]]
Former-commit-id: 5849925092
Former-commit-id: d5ee78ec7147794ad7f544578dc0b0342780e4bf [formerly 9091c46153
]
Former-commit-id: b663cb9989
2014-05-09 10:57:53 -05:00
Richard Peter
df357a67fe
Issue #2928 : Increase default thriftService byte limit to 250MB
...
Change-Id: I8a55fbce410e1787946f2dd38b3a41c84aab20bd
Former-commit-id: 87dec39958
[formerly b809ed50fd
] [formerly bd033db0f4
] [formerly acadd5b815
[formerly bd033db0f4
[formerly 1c5060d53524f195be7854ca66160d3d075c3112]]]
Former-commit-id: acadd5b815
Former-commit-id: b8973f06ea7a4e92647ce294c743d62f40633638 [formerly 67d637938e
]
Former-commit-id: 036909b7ac
2014-05-09 10:37:18 -05:00
Mike Duff
3966697849
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
...
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: f4062cd277
[formerly 0456fd0597
] [formerly 8498235fd8
] [formerly 6a67638a94
[formerly 8498235fd8
[formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]
Former-commit-id: 6a67638a94
Former-commit-id: 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9 [formerly 70c8135fde
]
Former-commit-id: f49192936a
2014-05-08 14:36:54 -05:00
Richard Peter
c7ed1a1a93
Omaha #1458 : Remove reference to cron.properties
...
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29
Former-commit-id: c4b6c6cc6e
[formerly 63114b4f82
] [formerly 86aea04167
] [formerly 0430619d7b
[formerly 86aea04167
[formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]
Former-commit-id: 0430619d7b
Former-commit-id: 1d72a41cca6b73062aea9ce9df36d0a583f99940 [formerly 02c77af062
]
Former-commit-id: 328a48a33d
2014-05-08 12:58:49 -05:00
Ben Steffensmeier
33e1805458
Issue #3080 Fix NaN handling of SliceSample.
...
Former-commit-id: 7a38637fb2
[formerly 3a87fa24df
] [formerly 0308147ad4
] [formerly 1b6bdeac86
[formerly 0308147ad4
[formerly 9974018df428c84528cf98e9f868740accbabf58]]]
Former-commit-id: 1b6bdeac86
Former-commit-id: 883fef057790d3aff91a5945cdfc9c0bb814b3f2 [formerly 80a819f65b
]
Former-commit-id: 7beb6429d4
2014-05-08 11:49:04 -05:00
Nate Jensen
c771f70e7d
Merge "Issue #2726 : Fix GeospatialDataGenerator NPE" into omaha_14.3.1
...
Former-commit-id: b415dd5c4e
[formerly 3fdd5dbdd6
] [formerly 8f8ac40c44
] [formerly d4fef60be1
[formerly 8f8ac40c44
[formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]]
Former-commit-id: d4fef60be1
Former-commit-id: a27e3174303ab185af39074281bca050c97c43f0 [formerly 04e906f1a6
]
Former-commit-id: a50afc30eb
2014-05-08 10:19:43 -05:00
Richard Peter
a65504b301
Issue #2726 : Fix GeospatialDataGenerator NPE
...
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0
Former-commit-id: 469f2771c3
[formerly 5a7c78c009
] [formerly 24539708f9
] [formerly 4d99d25a55
[formerly 24539708f9
[formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]
Former-commit-id: 4d99d25a55
Former-commit-id: 3612a21996e81b3e6f673f5982a4a6b310ad9022 [formerly 29a8db5216
]
Former-commit-id: 3c21c1042f
2014-05-08 10:14:30 -05:00
Steve Harris
bfd8f9b971
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
...
Former-commit-id: 9b4b0d5c01
[formerly a804a071c0
] [formerly ce2b030743
] [formerly ff4a6b8122
[formerly ce2b030743
[formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 12b7c2d1dfdafd204880707993afeebf47eefe41 [formerly 988ad59a0d
]
Former-commit-id: 532b861bce
2014-05-08 09:50:34 -05:00
Richard Peter
899b8ce879
Omaha #1458 : Break-out cron.properties.
...
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528
Former-commit-id: ab64a3e814
[formerly ad3f6c4af3
] [formerly 6469ae94ed
] [formerly 348bc25760
[formerly 6469ae94ed
[formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]
Former-commit-id: 348bc25760
Former-commit-id: a327ca6aece2679db79622f22c10369b6cebc586 [formerly 95488f49b1
]
Former-commit-id: c9d8bfdd06
2014-05-08 09:18:49 -05:00
Richard Peter
e3e1298591
Omaha #2782 : Update thread based logging
...
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8
Former-commit-id: 731f55d574
[formerly 242716fb0f
] [formerly fbc4428b8c610d5f30f8d66655122d6b8da482af [formerly d5ec01f7c0
]] [formerly adff7b5684
[formerly d5ec01f7c0
[formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]
Former-commit-id: adff7b5684
Former-commit-id: a8128262c0240c076be7f2d7613f15608d925c72 [formerly 7a7b65860b
]
Former-commit-id: 741710881f
2014-05-08 09:06:31 -05:00
Steve Harris
f1032ccc05
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 b7a1bda98c
[formerly e37e40ed19
[formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: d3c134610c7a2e642c723287f1d8135b292eb22c [formerly 9591532ffd
]
Former-commit-id: 7a7c1167c2
2014-05-07 16:01:53 -05:00
Nate Jensen
5289cdf95c
Issue #2060 fix grid updates and performance
...
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50
Former-commit-id: c41e84630c
[formerly c71edb2d4c
] [formerly e39378e5f0
] [formerly acfbce58d1
[formerly e39378e5f0
[formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]]
Former-commit-id: acfbce58d1
Former-commit-id: 18c8713f5f8a78687f4fbd908e1803323d6f2ff0 [formerly 5099fd6463
]
Former-commit-id: 81b914ad9f
2014-05-07 15:30:13 -05:00
Dave Hladky
af478efa5d
Issue #2940 More filenames printed, null from bad rec.
...
Former-commit-id: e40c9a7be8
[formerly cd4921b35f
] [formerly a2ef100bfc
] [formerly dadc604ab3
[formerly a2ef100bfc
[formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]
Former-commit-id: dadc604ab3
Former-commit-id: 30f08e0872c7bff47d05e441f1dd1375d4fa9d03 [formerly f54cbb83a1
]
Former-commit-id: e58fa39adc
2014-05-07 14:51:38 -05:00
Everett Kladstrup
a472cd5363
Omaha #3133 Remove some unecessary dependencies
...
* Remove viz.core dependency from uf.common.ohd
* Remove org.osgi.framework dependency from uf.edex.ndm
* Remove non-existant activator from uf.edex.ndm manifest
Former-commit-id: 4ea3156453
[formerly 516a50a6a1
] [formerly 3a00185e3c
] [formerly b4a76a575a
[formerly 3a00185e3c
[formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]]
Former-commit-id: b4a76a575a
Former-commit-id: 0b36cc357c9ac92e1860eb4bdfa5b01916468b94 [formerly ce743b3c43
]
Former-commit-id: a1070cc1ac
2014-05-07 12:54:37 -05:00
Nate Jensen
e979a3caeb
Issue #2060 log successful sat precip file creation
...
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1
Former-commit-id: a66c157399
[formerly 3c1f9693f2
] [formerly f06c77f5ad
] [formerly 170106ad44
[formerly f06c77f5ad
[formerly b3158ae940ab59a7a96b4650f0f956c82b0c9d49]]]
Former-commit-id: 170106ad44
Former-commit-id: 29afb4d86748112fab5054cd93607ac60cb3b546 [formerly af426cf278
]
Former-commit-id: 40b5e501a2
2014-05-07 09:44:20 -05:00
Nate Jensen
c333277d30
Issue #3101 fix some derived parameters on win64 platform
...
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86
Former-commit-id: 3aa9bfdca1
[formerly 49d34cc4e4
] [formerly 5191b61b30
] [formerly aa7c1fac90
[formerly 5191b61b30
[formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]
Former-commit-id: aa7c1fac90
Former-commit-id: e218d9c6b2e2544a412d7bf24b528ba73c8cd8fc [formerly 8c1748d370
]
Former-commit-id: 815aa21d8e
2014-05-06 17:08:04 -05:00
Everett Kladstrup
de20eacce2
Omaha #3112 Fix adding classes to WFS jaxb
...
* Rebuild JAXBContext after adding additional classes
* Set output directory in build.properties to fix deploy location
* Remove unecessary dependencies from wfs manifest
Former-commit-id: 129f3017bb
[formerly 2ee2db6f38
] [formerly 1184e77f1a
] [formerly aedb166b4d
[formerly 1184e77f1a
[formerly bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1]]]
Former-commit-id: aedb166b4d
Former-commit-id: 2e1fc87ea552bfc388ab6869d1d09dea57299cff [formerly 08e8a4a60a
]
Former-commit-id: 5f378b30f0
2014-05-06 17:07:23 -05:00
Richard Peter
8e8e1c45ed
Issue #2726 : update smartInit threads to 1
...
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0
Former-commit-id: 2044b64206
[formerly 884562700a
] [formerly 03ab7599de
] [formerly 611c010968
[formerly 03ab7599de
[formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]
Former-commit-id: 611c010968
Former-commit-id: f30788353ad2101cd2e64a4eed43d47dc68ddbb5 [formerly 4f2d470801
]
Former-commit-id: be288505e0
2014-05-06 15:54:23 -05:00
Nate Jensen
b16bfd2b38
Issue #2060 genericize DataURIFieldConverter
...
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4
Former-commit-id: 37b72c933b
[formerly 7701820902
] [formerly ff6c77420c
] [formerly 87b6df4840
[formerly ff6c77420c
[formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]
Former-commit-id: 87b6df4840
Former-commit-id: 620466e14629a8e102bf9c9fd5dc3bbc2e70ff37 [formerly a6363fc3d4
]
Former-commit-id: d1a040b9c2
2014-05-06 13:10:48 -05:00
Nate Jensen
de7bade647
Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
...
Former-commit-id: 8b2c2d4be5
[formerly d83fad0054
] [formerly 0e3876de34
] [formerly 4f734ae7f9
[formerly 0e3876de34
[formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: ad966bafd4b27ea29634f0d48df0a0cd01558773 [formerly 044d086fc1
]
Former-commit-id: 732aaa6001
2014-05-06 13:09:12 -05:00
Nate Jensen
e8ca9729eb
Issue #2060 fill in units on GridRecords created from URIs
...
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 1d38804eb2
[formerly 3719c41d2b
] [formerly 71b4227061
] [formerly 7cea97ab15
[formerly 71b4227061
[formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 4cf3887df369f38b75f0a2c9f9f7949057e50e42 [formerly 6bdbfb7e1a
]
Former-commit-id: 5bf1554597
2014-05-06 12:26:21 -05:00
Brian Clements
474068d56a
Omaha #3116 changed log formatter class to match camel 2.12.3
...
Former-commit-id: 73b643e157
[formerly 170ce2c157
] [formerly c77ba25dc8
] [formerly 51eb6c9f06
[formerly c77ba25dc8
[formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]]
Former-commit-id: 51eb6c9f06
Former-commit-id: a092d2d161356b1089eedda592170e6720447ad2 [formerly b8a648f543
]
Former-commit-id: 5b26766041
2014-05-06 11:38:38 -05:00
Richard Peter
9846fbd82c
Issue #2726 : Autoset route startup order.
...
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: f76ed476c8
[formerly 8ae9cfba55
] [formerly b148d11ec9
] [formerly 4dc91f494f
[formerly b148d11ec9
[formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]
Former-commit-id: 4dc91f494f
Former-commit-id: c051c2b6a07908c54dd3268091a67a3084664d5b [formerly c6719da76b
]
Former-commit-id: 7fe7b43ee2
2014-05-06 09:46:41 -05:00
Steve Harris
7245029570
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 83368e4b4e
[formerly 73ed3251bd
[formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]
Former-commit-id: 83368e4b4e
Former-commit-id: 2b3b76c82538d382ce6a14c9e014860eb6ff65e2 [formerly caadbd3dd9
]
Former-commit-id: ea24d1dadc
2014-05-05 16:04:09 -05:00
Nate Jensen
3853ef16bb
Issue #2060 fix sat precip for grid data URI removal
...
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: f76ace3c9b
[formerly 2b6c30e67d
] [formerly 0cf0f724f4
] [formerly d82f6e5ff6
[formerly 0cf0f724f4
[formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 7beb650628fb602c30c71cbf5eab29724e2cc3f8 [formerly 97597c3ab1
]
Former-commit-id: 09091ccf25
2014-05-05 13:06:08 -05:00
Dave Hladky
d9243205e4
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 ccaaa1cfea
[formerly 333bf8b36d
[formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8
]
Former-commit-id: 93ca9cfe6a
2014-05-05 12:15:14 -05:00
Brad Gonzales
58fda9c22a
Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
...
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115
Former-commit-id: 0470903200
[formerly cbcd7dcc3e
] [formerly df353f06f5
] [formerly 39a2ec8f46
[formerly df353f06f5
[formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]]
Former-commit-id: 39a2ec8f46
Former-commit-id: 702f18abf50a79b37863af04c5f8463202ed6024 [formerly 78714c6ff7
]
Former-commit-id: b33bd153f4
2014-05-02 13:09:57 -05:00
Richard Peter
2507aaf753
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
...
Former-commit-id: 98fa705dd0
[formerly f38816d168
] [formerly dc0b598fd4
] [formerly 132d63ac44
[formerly dc0b598fd4
[formerly 28b33188773001c34946464093319dc2a1117be9]]]
Former-commit-id: 132d63ac44
Former-commit-id: c5d890d7b24b88a20dc8c01d92647c6864edfb22 [formerly 5314b412b4
]
Former-commit-id: 8e141a137a
2014-05-02 10:05:59 -05:00
Ben Steffensmeier
ae0185a740
Issue #3095 Update JGridData for creation of numeric java package.
...
Former-commit-id: 80104eaf42
[formerly 956f62a6ec
] [formerly 6bdaba048c
] [formerly 23d6da4a18
[formerly 6bdaba048c
[formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]
Former-commit-id: 23d6da4a18
Former-commit-id: e59b9a37c055ead6793b199f1f61c40b65e25ce2 [formerly 3300d8c75c
]
Former-commit-id: d2c0499f2c
2014-05-01 18:02:08 -05:00
Steve Harris
9a268173ac
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: d2905e51d4
[formerly 9ecd871825
] [formerly c8ba70a146
] [formerly 779e85cc77
[formerly c8ba70a146
[formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]
Former-commit-id: 779e85cc77
Former-commit-id: bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be
]
Former-commit-id: 9a6ab8c52f
2014-05-01 13:25:15 -05:00
Steve Harris
e72b097763
Omaha #3085 - re-deleted stuff that was re-added in the merge from omaha_14.3.1 to omaha_14.4.1
...
Change-Id: Id13953881429545bccb590a550c23a73f77d585e
Former-commit-id: 05d6049e35
[formerly 11ca44c583
] [formerly 70ee74a311
] [formerly ab0b1ec047
[formerly 70ee74a311
[formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]]
Former-commit-id: ab0b1ec047
Former-commit-id: c4fa57c01ab1fe1ea3b7f0c5c4f08b8a4e6ba322 [formerly 579eb6e47a
]
Former-commit-id: beba75f87c
2014-05-01 12:53:06 -05:00
Nate Jensen
c617423fd7
Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
...
Former-commit-id: dba33e281e
[formerly ba9ed2aba3
] [formerly b7536a398b
] [formerly 96071c250d
[formerly b7536a398b
[formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]
Former-commit-id: 96071c250d
Former-commit-id: 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a
]
Former-commit-id: dbca36c2bc
2014-05-01 12:40:41 -05:00
Brian Clements
8fc0feed89
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: eae19ec5ca
[formerly 93912625ea
] [formerly 3ca4f8cc52
] [formerly dd5412e119
[formerly 3ca4f8cc52
[formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]
Former-commit-id: dd5412e119
Former-commit-id: f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56
]
Former-commit-id: 3fd504f1de
2014-05-01 12:34:09 -05:00
Bryan Kowal
5267bae3dd
Issue #3099 - handle empty location name lists in the data request
...
Former-commit-id: dfd5e3dbad
[formerly ff21ef813c
] [formerly 5eac78f0e0
] [formerly a9b9a8b8c4
[formerly 5eac78f0e0
[formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 766f5d140cfb513aced9899ffa7b673d5595123d [formerly 2079aec2bb
]
Former-commit-id: 4775dc1f40
2014-05-01 12:12:42 -05:00
Nate Jensen
3634889dab
Issue #3101 safe cast numpy shape values to Number
...
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c
Former-commit-id: fc261ab303
[formerly 7b2ed421f0
] [formerly 2a0775e748
] [formerly 76ad31501b
[formerly 2a0775e748
[formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]
Former-commit-id: 76ad31501b
Former-commit-id: cf11210c48f3e873f15155bc8644fb9af1296446 [formerly 191f6c3385
]
Former-commit-id: ffb294cab4
2014-05-01 11:01:37 -05:00
Brian Clements
00e7061f42
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 f45e435f2c
[formerly 873efa1c64
[formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782
]
Former-commit-id: 20830253ba
2014-04-30 17:52:43 -05:00
Richard Peter
9ee5b7c648
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 86ddd480c1
[formerly de9eb60629
[formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6
]
Former-commit-id: d961ff6edc
2014-04-30 17:43:50 -05:00
Dave Hladky
5fc17cf3b8
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f
[formerly e2a4bb6755
] [formerly c352643c79
] [formerly 3b00ae03cc
[formerly c352643c79
[formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740
]
Former-commit-id: ea791b5ca5
2014-04-30 17:38:28 -05:00
Nate Jensen
299cb28462
Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
...
Former-commit-id: 580a95ed41
[formerly f6f9169aef
] [formerly 1eade4f434
] [formerly f005d2f31c
[formerly 1eade4f434
[formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]
Former-commit-id: f005d2f31c
Former-commit-id: 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b
]
Former-commit-id: a6df4bd2b2
2014-04-30 15:16:11 -05:00
Ben Steffensmeier
410b30ef15
Issue #2946 Fix auxillary purge rules.
...
Former-commit-id: 8449ec8f22
[formerly bcc02476c6
] [formerly 2850d80610
] [formerly 4c06cd6f5e
[formerly 2850d80610
[formerly a62bdff82f96e79737269686598687ecef746c01]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: a295c948db1f2e4e6f82577553e64171a8f2dc5a [formerly e51a0dcb13
]
Former-commit-id: 076165515a
2014-04-30 14:38:27 -05:00