Commit graph

5378 commits

Author SHA1 Message Date
Brian Clements
ba3f3443ea Issue #2906 removed accidental manifest entry for bufr obs
Former-commit-id: c4bbcc0688 [formerly f2d2cab0fc] [formerly c4bbcc0688 [formerly f2d2cab0fc] [formerly e8708eb44d [formerly 76eb62c08d300e5c47321b9ecbfe65814bcf2960]]]
Former-commit-id: e8708eb44d
Former-commit-id: b83dc2f4e9 [formerly ca43897d73]
Former-commit-id: 21f66143d4
2014-04-10 15:31:53 -05:00
Nate Jensen
ddae3ce724 Merge "Issue #2725 Put derivparam plugins in viz and edex separately" into development
Former-commit-id: ecafc30027 [formerly ffc903d5c4] [formerly ecafc30027 [formerly ffc903d5c4] [formerly 7f8478ee0b [formerly 7e57057056f7bf092336a915a2bfec652be268eb]]]
Former-commit-id: 7f8478ee0b
Former-commit-id: 17bf6198d9 [formerly 11fd8d8055]
Former-commit-id: 632bfbb636
2014-04-10 15:12:24 -05:00
Nate Jensen
746c4d7908 Merge "Issue #2906 added synop bufr obs decoder" into development
Former-commit-id: 2df73a6601 [formerly 75b5f5b658] [formerly 2df73a6601 [formerly 75b5f5b658] [formerly 439dc71571 [formerly d214a46f19a939eec5d23d0c9029b1e85eaad447]]]
Former-commit-id: 439dc71571
Former-commit-id: 91c478cb8f [formerly 8788d46064]
Former-commit-id: 86b146a3ff
2014-04-10 15:09:39 -05:00
Brad Gonzales
be94e8a876 Issue #2730 remove extracted numpy directories and files
Change-Id: Ib1f47007c8820e89f75dadc25682aff7f356e99d

Former-commit-id: 99d4fc15ef [formerly 0e7f4d714d] [formerly 99d4fc15ef [formerly 0e7f4d714d] [formerly 9b73789b20 [formerly 329f95c875e55790821801fb0f7d70c26adc54f2]]]
Former-commit-id: 9b73789b20
Former-commit-id: d529943e99 [formerly edd15f2da6]
Former-commit-id: 16e48a8b1f
2014-04-10 15:04:50 -05:00
Matt Nash
6fc553f812 Issue #2241 fix tear off menus in practice mode
Change-Id: I52a2e9be64bff8a044b148666b7ad77670a6f64e

Former-commit-id: f5e333c154 [formerly 81c4976c96] [formerly f5e333c154 [formerly 81c4976c96] [formerly 0eed368ac4 [formerly 391655cd6a84c6cbf31e711ec5e1aa92833db896]]]
Former-commit-id: 0eed368ac4
Former-commit-id: d91e77641b [formerly 46df69447b]
Former-commit-id: 17f43a6114
2014-04-10 14:50:06 -05:00
Everett Kladstrup
1467f1a316 Issue #2725 Put derivparam plugins in viz and edex separately
Former-commit-id: 90244ad7ec [formerly d76aaed2f0] [formerly 90244ad7ec [formerly d76aaed2f0] [formerly 1a8a05cd0e [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: fa9ee97662 [formerly db413dc65f]
Former-commit-id: 1a68ea889a
2014-04-10 14:08:42 -05:00
Brad Gonzales
91d546d015 Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 5fcec27765 [formerly cc0fd1e9af] [formerly 5fcec27765 [formerly cc0fd1e9af] [formerly ea03096031 [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: e41f9defa4 [formerly 3b25edad9a]
Former-commit-id: 8f72707b3a
2014-04-10 14:01:53 -05:00
Nate Jensen
7cae36a45e Merge "Issue #1803 fix redbook sharing in collaboration" into development
Former-commit-id: 74a7189143 [formerly e88519c5e3] [formerly 74a7189143 [formerly e88519c5e3] [formerly 666b271528 [formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]]]
Former-commit-id: 666b271528
Former-commit-id: 5d17f07d25 [formerly 573981b0d5]
Former-commit-id: 4cffa91903
2014-04-10 13:50:55 -05:00
Mike Duff
b432d6a4f6 Issue #2892 - Fix problems loading saved configs for data browser dialog.
Change-Id: I73b98714642f5852f7209fd8533d49aa473412f9

Former-commit-id: 635684bb4e [formerly 33a2259cf4] [formerly 635684bb4e [formerly 33a2259cf4] [formerly da65756e3b [formerly 323badf58cf12a35b3a4d93ff0188b638e60969b]]]
Former-commit-id: da65756e3b
Former-commit-id: a23608ec59 [formerly 67ff4371b3]
Former-commit-id: bc82bf8f86
2014-04-10 13:31:42 -05:00
Brian Clements
e322c66ddd Issue #2906 added synop bufr obs decoder
fixed units in sfcobs point data description
made getDescription() and static constants public in point data transform
fixed typo in udunits alias file
created new decoder for synop bufr obs
added decoder and dependencies to features


Former-commit-id: 1e2ad93e65 [formerly 663337e661] [formerly 1e2ad93e65 [formerly 663337e661] [formerly 972d18cd3b [formerly b35756921a0ba5ff240b80f92322da90345c6eaf]]]
Former-commit-id: 972d18cd3b
Former-commit-id: e34f218002 [formerly a072496474]
Former-commit-id: 8388c00dc3
2014-04-10 12:08:27 -05:00
David Gillingham
2ab21ac335 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 1c7e650e6a [formerly c8a6dc8769] [formerly 1c7e650e6a [formerly c8a6dc8769] [formerly da31ab2042 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: 0385a4395e [formerly 72229cfb94]
Former-commit-id: 89046665f6
2014-04-10 11:24:40 -05:00
Nate Jensen
71e01e0264 Issue #1803 fix redbook sharing in collaboration
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: 4cccdac37e [formerly 1efb9a2a4d] [formerly 4cccdac37e [formerly 1efb9a2a4d] [formerly 4a826332e9 [formerly fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4]]]
Former-commit-id: 4a826332e9
Former-commit-id: 2750a173dc [formerly a191b473e2]
Former-commit-id: a3fef22e8b
2014-04-10 10:50:33 -05:00
Nate Jensen
fc4f5c60e6 Merge "Issue #2694 Improve error handling" into development
Former-commit-id: 288aa9b52c [formerly e327184bdc] [formerly 288aa9b52c [formerly e327184bdc] [formerly 9357bdfb0e [formerly a8707e3914a48b27d428340240eaa3eff48832f7]]]
Former-commit-id: 9357bdfb0e
Former-commit-id: 64f44d5e6c [formerly 3151a36ead]
Former-commit-id: a260797465
2014-04-10 10:23:22 -05:00
Ron Anderson
b5adcd9707 Issue #2694 Improve error handling
Change-Id: I576cd4950d73fd6ce82f982dbc165e18ecb240f3

Former-commit-id: 11f7c48504 [formerly e66c93553d] [formerly 11f7c48504 [formerly e66c93553d] [formerly 70faf6e7aa [formerly b9307d47ad5dabfd9664197025b675e0103e57ad]]]
Former-commit-id: 70faf6e7aa
Former-commit-id: 563e343ca6 [formerly 6891dab959]
Former-commit-id: 3886fae260
2014-04-10 10:11:22 -05:00
Brad Gonzales
60f66cda85 Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: fe95275a34 [formerly 056dbdbdff] [formerly fe95275a34 [formerly 056dbdbdff] [formerly d50f39e98d [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]]
Former-commit-id: d50f39e98d
Former-commit-id: 7472fb8084 [formerly 178e4fe8bb]
Former-commit-id: ebcb2cb414
2014-04-09 18:47:09 -05:00
Richard Peter
79e207774f Merge "Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks." into development
Former-commit-id: 8925673f3c [formerly 394a41738f] [formerly 8925673f3c [formerly 394a41738f] [formerly 8b98ee101c [formerly cfbbae53d8466f647a7258047604bb10c9fef682]]]
Former-commit-id: 8b98ee101c
Former-commit-id: 923b6887dc [formerly dfd19e7904]
Former-commit-id: 7a66487514
2014-04-09 16:42:31 -05:00
Nate Jensen
00fea2a73c Merge "Issue #2907 fix redbook decoding of month" into development
Former-commit-id: a7776cf961 [formerly 3aa8d0bfea] [formerly a7776cf961 [formerly 3aa8d0bfea] [formerly 01834f722a [formerly e8054a6cba060649a2bbe31ce4f2d8c704150ecf]]]
Former-commit-id: 01834f722a
Former-commit-id: 889db28e82 [formerly dac775ed4e]
Former-commit-id: ab92e421cb
2014-04-09 16:10:45 -05:00
Nate Jensen
5e95530353 Issue #2907 fix redbook decoding of month
Change-Id: Ieccea813452ba5708f039ea8aad0fd6f83c16f9a

Former-commit-id: 8b9e22751a [formerly 411779ce6f] [formerly 8b9e22751a [formerly 411779ce6f] [formerly 5905ff0dcf [formerly 74340639a9522668ea6b2113771d5828919c7f02]]]
Former-commit-id: 5905ff0dcf
Former-commit-id: 08f3535a49 [formerly 0630c1bc0c]
Former-commit-id: c1005eec2d
2014-04-09 16:07:56 -05:00
Nate Jensen
c2f1f5542a Merge "Issue #2725 Add new project to alertviz feature" into development
Former-commit-id: 56b820ab97 [formerly ec40cb3dfc] [formerly 56b820ab97 [formerly ec40cb3dfc] [formerly eaf1382178 [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]
Former-commit-id: eaf1382178
Former-commit-id: a0e2342126 [formerly 952586230a]
Former-commit-id: 8c6704e442
2014-04-09 16:07:25 -05:00
Everett Kladstrup
de0f935f69 Issue #2725 Add new project to alertviz feature
Former-commit-id: 963ce8716e [formerly e4633811fc] [formerly 963ce8716e [formerly e4633811fc] [formerly 02b47e4d5a [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: c2a96ba985 [formerly 55638c0916]
Former-commit-id: a00b1dd9f6
2014-04-09 16:01:57 -05:00
Nate Jensen
560bdaf4c8 Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
Former-commit-id: ad961bb84d [formerly 0dd55f63ba] [formerly ad961bb84d [formerly 0dd55f63ba] [formerly 88d0e400fb [formerly 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340]]]
Former-commit-id: 88d0e400fb
Former-commit-id: dfac2a42c2 [formerly a2c4c63852]
Former-commit-id: 5a2f9a2e04
2014-04-09 14:07:09 -05:00
Everett Kladstrup
136af85d0c Issue #2725 Remove datacube plugin from viz.core feature
Former-commit-id: b670fa67f6 [formerly 50346d5aec] [formerly b670fa67f6 [formerly 50346d5aec] [formerly ef21ea5c1f [formerly 1c72a291c9623f3930ca71da67e87ef884c81a94]]]
Former-commit-id: ef21ea5c1f
Former-commit-id: fd9bd8282a [formerly 9faba2afbf]
Former-commit-id: 21c7199512
2014-04-09 13:59:11 -05:00
Roger Ferrel
6508e30611 Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908

Former-commit-id: 032ee7ef77 [formerly 226b1be015] [formerly 032ee7ef77 [formerly 226b1be015] [formerly c86d738d5b [formerly 09e4f116a482f2a197c01cdec3609e10e1d2285d]]]
Former-commit-id: c86d738d5b
Former-commit-id: eec1d22987 [formerly 0d85ae72e0]
Former-commit-id: 388ea1349a
2014-04-09 13:57:55 -05:00
Everett Kladstrup
619ccff21b Issue #2725 Add new plugin to uf.viz.base feature
Former-commit-id: 91673b18b0 [formerly 8d918404d5] [formerly 91673b18b0 [formerly 8d918404d5] [formerly 28364c8618 [formerly 828a32f1753a40613bb0351281458bee1d45cba6]]]
Former-commit-id: 28364c8618
Former-commit-id: d968a60023 [formerly 378193b61f]
Former-commit-id: 64dad45a1c
2014-04-09 13:43:09 -05:00
Steve Harris
bab730727e Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
Former-commit-id: 842e355cc7 [formerly ae196946b9] [formerly 842e355cc7 [formerly ae196946b9] [formerly 2ea3d45ecc [formerly 0b9acf9e28c1048bd3b98af7c04e6953c8425e81]]]
Former-commit-id: 2ea3d45ecc
Former-commit-id: cf3bc163b6 [formerly 2efe4d5c6f]
Former-commit-id: d2f3b72736
2014-04-09 13:24:52 -05:00
Ben Steffensmeier
28f06f5bfc Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
Former-commit-id: 9c5eb936d3 [formerly 5328415054] [formerly 9c5eb936d3 [formerly 5328415054] [formerly daff2b9d9d [formerly 67302674101992ae5416f342f92acab9233a113d]]]
Former-commit-id: daff2b9d9d
Former-commit-id: 88f5dbe81d [formerly f5271a94d6]
Former-commit-id: cf81a60e7c
2014-04-09 13:19:21 -05:00
Richard Peter
80ad3d483f Merge "Issue #2725 Post "derived parameter move" changes" into development
Former-commit-id: bf4617bc39 [formerly c6dd5bee41] [formerly bf4617bc39 [formerly c6dd5bee41] [formerly c1dde5cb3a [formerly 635ea082393013a6967f177c419204197c9741f2]]]
Former-commit-id: c1dde5cb3a
Former-commit-id: caa3b3c51f [formerly 4084c12c27]
Former-commit-id: f9619588bd
2014-04-09 11:37:09 -05:00
Nate Jensen
edc55ee2ca Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
Former-commit-id: 187a895056 [formerly b58bb8500c] [formerly 187a895056 [formerly b58bb8500c] [formerly 2c2e324401 [formerly c66a85a125bb590abad607eb751b0baf9c07a3ba]]]
Former-commit-id: 2c2e324401
Former-commit-id: f574c535f5 [formerly 8999051f04]
Former-commit-id: 4af6b91229
2014-04-09 11:22:07 -05:00
Nate Jensen
801f6f7a5c Merge "Issue #2950 Add option to interpolate image colors." into development
Former-commit-id: 0da28c9c7a [formerly 1f2809ced0] [formerly 0da28c9c7a [formerly 1f2809ced0] [formerly d729cc70af [formerly 1db00446a00b6cd268b169871eadd1bef407e268]]]
Former-commit-id: d729cc70af
Former-commit-id: 6f36916c31 [formerly c460736793]
Former-commit-id: 91ef6f7b9c
2014-04-09 11:20:59 -05:00
Everett Kladstrup
abf4bd55a1 Issue #2725 Post "derived parameter move" changes
* move derived parameter definitions to base localization level
* remove java 7 exception constructor from inventory plugin
* move python function adapter to derivparam.python plugin


Former-commit-id: 0e88702cea [formerly 16b4c9253e] [formerly 0e88702cea [formerly 16b4c9253e] [formerly 41b154802c [formerly c54110914a3a64a2ea7c22093327c9e0d84689b2]]]
Former-commit-id: 41b154802c
Former-commit-id: 2ace82f815 [formerly f6bf1f43bd]
Former-commit-id: a89211f60a
2014-04-09 11:20:14 -05:00
Nate Jensen
4fe2e3a01b Merge "Issue #2950 Support dynamic color counts for color map editing." into development
Former-commit-id: 6989999e95 [formerly 5129002e91] [formerly 6989999e95 [formerly 5129002e91] [formerly 5bad21f3e6 [formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 58516f3a9f [formerly 92f0182d3f]
Former-commit-id: a08e3a4f1a
2014-04-09 11:20:04 -05:00
Mike Duff
494c577a1b Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

Former-commit-id: 5e39f5a61c [formerly 23474c5ead] [formerly 5e39f5a61c [formerly 23474c5ead] [formerly eafa177f4b [formerly a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1]]]
Former-commit-id: eafa177f4b
Former-commit-id: 1363155c34 [formerly ee80debc36]
Former-commit-id: 6e6ac425af
2014-04-09 10:17:22 -05:00
Richard Peter
17f405cbaa Merge "Issue #2725 Move derived parameters logic to common" into development
Former-commit-id: 16e1018dd9 [formerly ea4d09c674] [formerly 16e1018dd9 [formerly ea4d09c674] [formerly ed25b71ff1 [formerly d97da3eb67c00a8d5bf1af0fae453fa9c96aacc4]]]
Former-commit-id: ed25b71ff1
Former-commit-id: a32e066d95 [formerly ce7e0f9a31]
Former-commit-id: 5fd6492386
2014-04-09 09:33:56 -05:00
Nate Jensen
a396472116 Merge "Issue #2920 Fix serialization of DrawStringEvent." into development
Former-commit-id: 6aa42816ec [formerly abee6815ad] [formerly 6aa42816ec [formerly abee6815ad] [formerly 143c3e1801 [formerly 663db14c5fa57c1d9ccd9c3d6ef82862d330a4b4]]]
Former-commit-id: 143c3e1801
Former-commit-id: 9899b9ecab [formerly 0ea487feec]
Former-commit-id: 030857c8a9
2014-04-09 09:32:39 -05:00
Everett Kladstrup
7b2683532a Issue #2725 Move derived parameters logic to common
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: 8b19b3601a [formerly 06d6961c0f] [formerly 8b19b3601a [formerly 06d6961c0f] [formerly 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]
Former-commit-id: 0699041518
Former-commit-id: 86bf2b5ea0 [formerly 260d0beddc]
Former-commit-id: d96b56c91a
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
b81d14f2ea Issue #2920 Fix serialization of DrawStringEvent.
Former-commit-id: d09b87736a [formerly 0abf71f719] [formerly d09b87736a [formerly 0abf71f719] [formerly d43e5abf29 [formerly d88bdcccb805896e32766373bc07185364741d4e]]]
Former-commit-id: d43e5abf29
Former-commit-id: 41e508b0da [formerly 6327c3a673]
Former-commit-id: 4e33194b36
2014-04-09 09:21:45 -05:00
Nate Jensen
83917ecb21 Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development
Former-commit-id: 44f93acd4d [formerly 847481950c] [formerly 44f93acd4d [formerly 847481950c] [formerly ea3a8e29c3 [formerly 2f4d6ca7b78e40d11a3dbfd66969681ddd2135fd]]]
Former-commit-id: ea3a8e29c3
Former-commit-id: 7a9f211997 [formerly e99ad67ada]
Former-commit-id: f487346af7
2014-04-09 08:50:45 -05:00
Ben Steffensmeier
80476e1f60 Issue #2950 Support dynamic color counts for color map editing.
Former-commit-id: 9d7504e2c3 [formerly c5a48642eb] [formerly 9d7504e2c3 [formerly c5a48642eb] [formerly c805a5fed7 [formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]]
Former-commit-id: c805a5fed7
Former-commit-id: cf3456c6cd [formerly 16446101a4]
Former-commit-id: e0ff68736e
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
ac3489121d Issue #2950 Add option to interpolate image colors.
Former-commit-id: c2e028f178 [formerly bd3ad2a477] [formerly c2e028f178 [formerly bd3ad2a477] [formerly 525cf4053f [formerly 5bb0c1e3cc65fc86b48565603f2f78a4ad1e1be7]]]
Former-commit-id: 525cf4053f
Former-commit-id: de4386e102 [formerly 9481062a43]
Former-commit-id: 96ad01ec91
2014-04-08 15:19:00 -05:00
Nate Jensen
7d8ea4b1cb Merge "Issue #2920 Allow strings to use mulitple styles." into development
Former-commit-id: b793ce20bc [formerly 811364eb73] [formerly b793ce20bc [formerly 811364eb73] [formerly 3fff4e77d4 [formerly 1b07e87178947df4d579dbc32057e883b61a7de2]]]
Former-commit-id: 3fff4e77d4
Former-commit-id: 41a7098166 [formerly 2fdac5fec2]
Former-commit-id: a87b131d94
2014-04-08 14:28:44 -05:00
Mike Duff
2b520fe31e Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: bdde561f8a [formerly efefe62e0f] [formerly bdde561f8a [formerly efefe62e0f] [formerly 7da1547c22 [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]
Former-commit-id: 7da1547c22
Former-commit-id: 2b67272b60 [formerly 7145820d62]
Former-commit-id: 3c6c0824ce
2014-04-08 14:14:20 -05:00
Nate Jensen
0bcbf71dc5 Merge "Issue #2968 improve efficiency by only compressing/serializing persisted objects once" into development
Former-commit-id: 8bf64d8006 [formerly e7aed56884] [formerly 8bf64d8006 [formerly e7aed56884] [formerly e44d1143c0 [formerly e2cd80cc4e2fbaaca7a8b34b6657a818d35cee4d]]]
Former-commit-id: e44d1143c0
Former-commit-id: f7096faf91 [formerly c1e383f8bf]
Former-commit-id: cfe82eb2c5
2014-04-08 13:16:45 -05:00
Nate Jensen
65e26b4418 Issue #2968 improve efficiency by only compressing/serializing persisted
objects once

Change-Id: Iba90717d049571b801254852a7fd5a73202701f2

Former-commit-id: 579584c346 [formerly e3df98635a] [formerly 579584c346 [formerly e3df98635a] [formerly aaf2d3c8a4 [formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]]
Former-commit-id: aaf2d3c8a4
Former-commit-id: 45ccb7d7fe [formerly 8cb284d2c2]
Former-commit-id: 773dad337d
2014-04-08 12:59:16 -05:00
Brian.Dyke
c99b4f3027 Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 529059851a [formerly 20fef0f15b] [formerly 529059851a [formerly 20fef0f15b] [formerly 79c7ec7ae9 [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]]
Former-commit-id: 79c7ec7ae9
Former-commit-id: 20c27a479d [formerly 538b02e42b]
Former-commit-id: c58835a7e3
2014-04-08 13:05:12 -04:00
Brad Gonzales
0c3ca023de Issue #2694 Added missing org.codehaus.jackson dependency to com.raytheon.uf.edex.base.feature.
Amend:  removed org.codehaus.jackson dependency from com.raytheon.uf.edex.datadelivery.core.feature.

Change-Id: Id36525e4e0e4764c648a4abca938e4131b23f3e0

Former-commit-id: 100252664e [formerly 579ba2a117] [formerly 100252664e [formerly 579ba2a117] [formerly 2909580bc3 [formerly 43e4da8b175ce20c9a4f9b94b1cb243c4355e72b]]]
Former-commit-id: 2909580bc3
Former-commit-id: 2f5c99f364 [formerly db463891cd]
Former-commit-id: e7d2d8720e
2014-04-08 11:55:23 -05:00
Richard Peter
93b7e76a4c Merge "Issue #2694 Fix dependency issues in the build." into development
Former-commit-id: 00ccec2f02 [formerly 98050f9c32] [formerly 00ccec2f02 [formerly 98050f9c32] [formerly 06c531a0f6 [formerly 88d577c5be8349367df7e29b78b31b7ea5e5ab53]]]
Former-commit-id: 06c531a0f6
Former-commit-id: ca9e1c334d [formerly 401eeaff70]
Former-commit-id: be925652a7
2014-04-08 09:57:13 -05:00
Ron Anderson
8896109c0d Issue #2694 Fix dependency issues in the build.
Change-Id: Ie0bc386851869bb0b7e56c117193c84e5fa03e91

Former-commit-id: e71d8778c2 [formerly c20a2f2e0d] [formerly e71d8778c2 [formerly c20a2f2e0d] [formerly 5e7a694eb7 [formerly 6f530a08a2a823ce01ef66b8e10ff52d9626de3f]]]
Former-commit-id: 5e7a694eb7
Former-commit-id: fc6a3264e0 [formerly bba62096a1]
Former-commit-id: 6d0ba04567
2014-04-08 09:49:56 -05:00
Nate Jensen
00a0ffd1b1 Merge "Issue #2968 fix buffer thread safety issues" into development
Former-commit-id: ccb6c8fc2c [formerly e3e5a25484] [formerly ccb6c8fc2c [formerly e3e5a25484] [formerly a03ca229e7 [formerly 30eee9a48d797c2e6cd509fd878b1b2ee759c105]]]
Former-commit-id: a03ca229e7
Former-commit-id: f16f51aa12 [formerly ac7f0b69a4]
Former-commit-id: 46f7341c14
2014-04-08 09:46:11 -05:00
Nate Jensen
99c8cd3c01 Merge "Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM" into development
Former-commit-id: 000c6e7138 [formerly 9423a189a9] [formerly 000c6e7138 [formerly 9423a189a9] [formerly 2626eaee24 [formerly 82ab9e637e9877f0c55495852001cb541754708e]]]
Former-commit-id: 2626eaee24
Former-commit-id: 7705fc909a [formerly 9b4f8ca1fc]
Former-commit-id: ac7ee4c039
2014-04-08 09:08:45 -05:00
Nate Jensen
a2d09fd948 Issue #2968 fix buffer thread safety issues
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2

Former-commit-id: 5c775618e3 [formerly e11a5c4559] [formerly 5c775618e3 [formerly e11a5c4559] [formerly f2b18b76f2 [formerly edc629d4b63f2a873752a232ee8f6530ec314595]]]
Former-commit-id: f2b18b76f2
Former-commit-id: f5d594bddc [formerly ae9c53fd05]
Former-commit-id: e936e5cac3
2014-04-07 17:30:27 -05:00