Lee Venable
db4f3fd35a
Merge "Issue #2437 - fixed color memory leak." into development
...
Former-commit-id: 3bfe4bf45c
[formerly 5081bbd0ab
] [formerly 3bfe4bf45c
[formerly 5081bbd0ab
] [formerly b1d02c6a49
[formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]]]
Former-commit-id: b1d02c6a49
Former-commit-id: ee63fc9004
[formerly 4060fa7e0b
]
Former-commit-id: 13a8614130
2013-10-07 14:13:56 -05:00
Lee Venable
61201849dd
Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
...
Former-commit-id: f94bcf4776
[formerly eeee5c7948
] [formerly f94bcf4776
[formerly eeee5c7948
] [formerly c01eb85e53
[formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]]]
Former-commit-id: c01eb85e53
Former-commit-id: 18bbfeb4cb
[formerly 72a6650958
]
Former-commit-id: f34b07d207
2013-10-07 13:56:50 -05:00
Lee Venable
d07fc36b0c
Issue #2437 - fixed color memory leak.
...
Former-commit-id: 615fcc7f8e
[formerly 604f8f86a4
] [formerly 615fcc7f8e
[formerly 604f8f86a4
] [formerly a4be7633a6
[formerly f081bea82ced5931f8424d51994571d5a9971cfe]]]
Former-commit-id: a4be7633a6
Former-commit-id: 046a0a764d
[formerly b3efbb97c1
]
Former-commit-id: 27a4e1ef75
2013-10-07 13:55:54 -05:00
Nate Jensen
e86afaee6d
Issue #2361 remove XML annotations from IHFS table classes
...
Change-Id: I10c3fb7aeec4ec96a17d54ee388c4b0770e9e939
Former-commit-id: f2dd7d28e1
[formerly 55a39d6458
] [formerly f2dd7d28e1
[formerly 55a39d6458
] [formerly ded2e8a852
[formerly 137b91fdad93d661243ecfbb60e28dc0c77b5b76]]]
Former-commit-id: ded2e8a852
Former-commit-id: e40465105c
[formerly 1d3b896c05
]
Former-commit-id: e267e0336b
2013-10-07 13:06:05 -05:00
Richard Peter
74b976232c
Issue #2357 : Remove edex jms resource reuse by other threads.
...
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823
Former-commit-id: c146f90a09
[formerly be99174b65
] [formerly c146f90a09
[formerly be99174b65
] [formerly 802ab87e57
[formerly a13a027b07a8d080c4506748afe5882575ae6532]]]
Former-commit-id: 802ab87e57
Former-commit-id: 7dc61aceee
[formerly 5320536f54
]
Former-commit-id: 91bf400b6a
2013-10-07 12:38:08 -05:00
Bryan Kowal
f7c5884c21
Issue #2033 - deploy the CAVE localization to the etc directory at installation time
...
Change-Id: I899b89c12d2bbe2fb739ba15b3bafbc9855e6102
Former-commit-id: 5f72ab9b4e
[formerly 73ccd8245d
] [formerly 5f72ab9b4e
[formerly 73ccd8245d
] [formerly c3a65f9882
[formerly 40d1633bb60c1d9aefcc79022158a66b50cca054]]]
Former-commit-id: c3a65f9882
Former-commit-id: 0f9d525ac1
[formerly e27bfa7c27
]
Former-commit-id: 2f2c57b448
2013-10-07 12:22:50 -05:00
Ben Steffensmeier
32cd056472
Issue #2421 optimize color map loading.
...
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304
Former-commit-id: bae5c951d4
[formerly f4c616fbff
] [formerly bae5c951d4
[formerly f4c616fbff
] [formerly 4e998f2576
[formerly ce15657bc794afe819d729121bc202b4f43b97d6]]]
Former-commit-id: 4e998f2576
Former-commit-id: 8428550b79
[formerly 76c73c10af
]
Former-commit-id: 1f1f157c17
2013-10-07 12:04:19 -05:00
Bryan Kowal
ed95cf88b9
Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
...
Former-commit-id: 6e05c00981
[formerly 0698d28222
] [formerly 6e05c00981
[formerly 0698d28222
] [formerly 82d61b53d4
[formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]]]
Former-commit-id: 82d61b53d4
Former-commit-id: 5cd20aed43
[formerly 551b501e2e
]
Former-commit-id: d0c79c347c
2013-10-07 11:52:58 -05:00
Greg Armendariz
249ea872cc
Merge "Revert "Issue #2033 - msi build updates"" into development
...
Former-commit-id: 9a75ba8d59
[formerly 2059cbc573
] [formerly 9a75ba8d59
[formerly 2059cbc573
] [formerly b09988c403
[formerly 7157d5791045a456ebe9eef1c8ce21e549bf0761]]]
Former-commit-id: b09988c403
Former-commit-id: f03c56aa9d
[formerly 74b1f23db7
]
Former-commit-id: 25e168e8a2
2013-10-07 10:01:14 -05:00
Benjamin Phillippe
dc4b2c7ac3
Issue #2385 Fixed subscription backup web page
...
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf
Former-commit-id: ce3e85e4d4
[formerly 2759456eb4
] [formerly ce3e85e4d4
[formerly 2759456eb4
] [formerly 5e72b8fa2e
[formerly 8a0e996d66b57d071870b907bcf224310d4b10c8]]]
Former-commit-id: 5e72b8fa2e
Former-commit-id: 4fef3dad20
[formerly 323d9f40da
]
Former-commit-id: b25530ea61
2013-10-07 09:52:47 -05:00
Lee Venable
7ac56a3b59
Merge "Issue #2436 - disposed of the sort color" into development
...
Former-commit-id: 0eff818ede
[formerly c1991c5c66
] [formerly 0eff818ede
[formerly c1991c5c66
] [formerly 7bd1fec82e
[formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: a55d310ebe
[formerly bdd28e1e09
]
Former-commit-id: 9d07c6428b
2013-10-07 09:30:45 -05:00
Nate Jensen
3d36bc8ee5
Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
...
Former-commit-id: be1385b705
[formerly adc774bee9
] [formerly be1385b705
[formerly adc774bee9
] [formerly c36c50d189
[formerly a686d702002a5e01389be1fd5e72558239687080]]]
Former-commit-id: c36c50d189
Former-commit-id: 01997dd1fb
[formerly 10ba6f231a
]
Former-commit-id: 315026f786
2013-10-07 09:30:31 -05:00
Lee Venable
b0af7745a6
Issue #2436 - disposed of the sort color
...
Former-commit-id: 8c8adf8be6
[formerly 9c97908f36
] [formerly 8c8adf8be6
[formerly 9c97908f36
] [formerly c4ddd46b44
[formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]
Former-commit-id: c4ddd46b44
Former-commit-id: 2ed106cac4
[formerly 46db8998a6
]
Former-commit-id: 1000147d0c
2013-10-07 09:11:25 -05:00
David Gillingham
c281c6be1b
Issue #2418 : Add display support for pSurge 2.0 data in GFE.
...
Change-Id: Ifbd6df0247c26ea250cd52430211c51cf71c7381
Former-commit-id: 8bc1325626
[formerly 0fba91a985
] [formerly 8bc1325626
[formerly 0fba91a985
] [formerly 8eba0e3dea
[formerly 840d411da94fd6267d6a91831257454595bfa66b]]]
Former-commit-id: 8eba0e3dea
Former-commit-id: e9d6191c98
[formerly aae6f4a634
]
Former-commit-id: 7be13ee945
2013-10-04 12:58:07 -05:00
Dave Hladky
ab9c5af250
Issue #1797 Separation of gridded time and abstract time object
...
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63
Former-commit-id: 4d4d93fc0a
[formerly e0ec10d073
] [formerly 4d4d93fc0a
[formerly e0ec10d073
] [formerly 1733834e74
[formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]
Former-commit-id: 1733834e74
Former-commit-id: 21239525ea
[formerly 89c341509c
]
Former-commit-id: 3ba8fd56f7
2013-10-04 10:36:27 -05:00
Steve Harris
e1f7463a41
13.5.2-8 baseline
...
Former-commit-id: 8ba7d392d6
[formerly 94aa71fcd1
] [formerly 8ba7d392d6
[formerly 94aa71fcd1
] [formerly 18325949fb
[formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 21b84f0290
[formerly d89fbf73d9
]
Former-commit-id: 088eb89ca7
2013-10-04 11:30:03 -04:00
Bryan Kowal
07a882ac48
Revert "Issue #2033 - pde and rpm build updates"
...
Undo copying localization into etc at build time.
This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a
] [formerly 33a9270304
[formerly 6023c61bca
] [formerly 33a9270304
[formerly 6023c61bca
] [formerly 9a77e3553a
[formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]].
Former-commit-id: a75ed2b079
[formerly bb2e914c00
] [formerly a75ed2b079
[formerly bb2e914c00
] [formerly 9d47e7565d
[formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]
Former-commit-id: 9d47e7565d
Former-commit-id: d4eba48f94
[formerly 4d08d7a1c3
]
Former-commit-id: 2f6791dc19
2013-10-04 09:47:59 -05:00
Bryan Kowal
0ad325f534
Revert "Issue #2033 - msi build updates"
...
Undo copying localization into etc at build time.
This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1
] [formerly 3bf9b72f52
[formerly 7208eadbfb
] [formerly 3bf9b72f52
[formerly 7208eadbfb
] [formerly e46254cef1
[formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]].
Former-commit-id: 1632c72103
[formerly 02e1055f19
] [formerly 1632c72103
[formerly 02e1055f19
] [formerly 3d6ff3f0fa
[formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: a29a8b8d0e
[formerly ac0b2bd9eb
]
Former-commit-id: b72e77fdc0
2013-10-04 09:47:59 -05:00
Mike Duff
6a1030a923
Issue #2375 - Fix for set number of rows in notification center
...
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994
Former-commit-id: 80081ff25b
[formerly 865b5f6878
] [formerly 80081ff25b
[formerly 865b5f6878
] [formerly d258009cc7
[formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]
Former-commit-id: d258009cc7
Former-commit-id: 2261f9ff61
[formerly 81bd77e56d
]
Former-commit-id: 96df3a4989
2013-10-04 09:27:30 -05:00
Ben Steffensmeier
edeb2950ad
Issue #2402 Make PythonDecoder more extendable.
...
Former-commit-id: f848fa2218
[formerly a5a0bf72b6
] [formerly f848fa2218
[formerly a5a0bf72b6
] [formerly 058b32eaec
[formerly 19329b4f5a621f20bc45beedbe5acaadc84e9c2f]]]
Former-commit-id: 058b32eaec
Former-commit-id: d0c330f5a2
[formerly 2bccf6a62d
]
Former-commit-id: dcc0043064
2013-10-03 18:19:04 -05:00
Richard Peter
19e860f9a8
Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
...
Former-commit-id: f52fdf1916
[formerly 5adf4298ef
] [formerly f52fdf1916
[formerly 5adf4298ef
] [formerly bc3843dc75
[formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]
Former-commit-id: bc3843dc75
Former-commit-id: 8694f13766
[formerly f7a7228e09
]
Former-commit-id: 2af4638a97
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
8187fb1fa8
Issue #2390 update grib decoder and vb to handle new storm surge parameters.
...
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209
Former-commit-id: 7f7aa20d0a
[formerly 236b3fe05f
] [formerly 7f7aa20d0a
[formerly 236b3fe05f
] [formerly 8f94e1434c
[formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]
Former-commit-id: 8f94e1434c
Former-commit-id: 69eec8d4c6
[formerly d4670d19b1
]
Former-commit-id: 9a0a15ffd8
2013-10-03 16:30:13 -05:00
Steve Harris
a9d0caa9d7
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/awips2.core/Installer.java/1.6/component.spec
Former-commit-id: 96f30b4793
[formerly 8622cc6efa
] [formerly 96f30b4793
[formerly 8622cc6efa
] [formerly df206f83bb
[formerly d1246136b73673acd22df53fee02adbd51022b4b]]]
Former-commit-id: df206f83bb
Former-commit-id: 00cc9bc926
[formerly 05ac206277
]
Former-commit-id: b225dffea0
2013-10-03 16:04:21 -05:00
Nate Jensen
3a28687ca2
Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
...
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650
Former-commit-id: ee134db130
[formerly 3f24b9e424
] [formerly ee134db130
[formerly 3f24b9e424
] [formerly 42fee320ab
[formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]]]
Former-commit-id: 42fee320ab
Former-commit-id: 82e0af6a9c
[formerly 160d1fbb01
]
Former-commit-id: 25bdea7759
2013-10-03 15:18:55 -05:00
Nate Jensen
96672be561
Merge "Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness" into development
...
Former-commit-id: 4fa6911aa0
[formerly 23c742c202
] [formerly 4fa6911aa0
[formerly 23c742c202
] [formerly 36f5c2c44b
[formerly fdf53f7eb888c38849821457fe248ba1f399b6e5]]]
Former-commit-id: 36f5c2c44b
Former-commit-id: 649c3b0e7d
[formerly 485a36fbb4
]
Former-commit-id: 084a495032
2013-10-03 12:56:47 -05:00
Roger Ferrel
7bb7770fbf
Issue #2326 Added user roles for Archive case and retention.
...
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967
Former-commit-id: c959cedd99
[formerly 7f7064d457
] [formerly c959cedd99
[formerly 7f7064d457
] [formerly 42705e4dfa
[formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 220769dab0
[formerly 4c27adcc53
]
Former-commit-id: 029eec5dc4
2013-10-03 12:33:26 -05:00
Bryan Kowal
16efd625bb
Issue #2423 - Java 7 Revision 40 for Linux
...
Former-commit-id: ef93741056
[formerly 3b1f089cbd
] [formerly ef93741056
[formerly 3b1f089cbd
] [formerly 26f787ac83
[formerly 665399b4e10d7d001edc2533b29324da48b78aa9]]]
Former-commit-id: 26f787ac83
Former-commit-id: 2e9836e506
[formerly 429c534da0
]
Former-commit-id: 9f7222a1b3
2013-10-03 11:54:23 -05:00
Max Schenkelberg
6e5873733e
Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
...
Amend: Accepted ticket.
Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830
Former-commit-id: 780ac0129f
[formerly e3f6b1ea21
] [formerly 780ac0129f
[formerly e3f6b1ea21
] [formerly 866c851b47
[formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]
Former-commit-id: 866c851b47
Former-commit-id: 43b7cb3107
[formerly ba25f56dbe
]
Former-commit-id: 80efdbb2b4
2013-10-03 11:43:26 -05:00
Ben Steffensmeier
938ace6bae
Issue #2363 Add more vector configuration optons.
...
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644
Former-commit-id: 860258e49c
[formerly ff06ea1c5a
] [formerly 860258e49c
[formerly ff06ea1c5a
] [formerly 20853f7333
[formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]]]
Former-commit-id: 20853f7333
Former-commit-id: bf0642450c
[formerly 6c7c693581
]
Former-commit-id: baa1ddd596
2013-10-03 10:36:47 -05:00
Bryan Kowal
e874f182ef
Issue #2432 - fix qpid build
...
Former-commit-id: fdf31a8a6e
[formerly 5db663c2ae
] [formerly fdf31a8a6e
[formerly 5db663c2ae
] [formerly 6736231873
[formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]
Former-commit-id: 6736231873
Former-commit-id: bd93d164c7
[formerly f100a9c96a
]
Former-commit-id: 751cd48248
2013-10-03 08:33:15 -05:00
Bryan Kowal
a249b45111
Issue #2422 - fix 14.2.1 RHEL6 build
...
Former-commit-id: efd377f12f
[formerly 61527c0b80
] [formerly efd377f12f
[formerly 61527c0b80
] [formerly 87087a5ea4
[formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]
Former-commit-id: 87087a5ea4
Former-commit-id: af4b729522
[formerly fe4e9ca3f8
]
Former-commit-id: 297ee050ca
2013-10-02 18:41:11 -05:00
Bryan Kowal
767466a8fe
Issue #2295 - CAVE updates for ALR
...
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc
Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76
Former-commit-id: 4342c463b2
[formerly aa8691edfd
] [formerly 4342c463b2
[formerly aa8691edfd
] [formerly 4e4405b0f5
[formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 6c60d06f9f
[formerly a727bf3927
]
Former-commit-id: 4ce26acc3b
2013-10-02 15:49:17 -05:00
Bryan Kowal
58ed2e7ae7
Issue #2272 - EDEX updates for ALR
...
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically
Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369
Former-commit-id: 60c544c7a9
[formerly 26cf5dad60
] [formerly 60c544c7a9
[formerly 26cf5dad60
] [formerly 73690a97aa
[formerly d1f201a579b9a0421295df26c9ad17717581073f]]]
Former-commit-id: 73690a97aa
Former-commit-id: 6162beb8e0
[formerly 86e0b3480f
]
Former-commit-id: 6db57eb23e
2013-10-02 15:49:16 -05:00
Greg Armendariz
48595626a4
Merge "Issue #2142 fix hibernate log" into development
...
Former-commit-id: 1c7dcca534
[formerly 16e36817cf
] [formerly 1c7dcca534
[formerly 16e36817cf
] [formerly f7b6c60ee6
[formerly bf5cbc38c8b345830c673cda8078a62de8040335]]]
Former-commit-id: f7b6c60ee6
Former-commit-id: 18f6b66b7a
[formerly b2c2fcb968
]
Former-commit-id: 13fbc8b6ef
2013-10-02 15:32:54 -05:00
Nate Jensen
fc53dae5f8
Issue #2142 fix hibernate log
...
Change-Id: I20cfbaacd210ec43f6228d094669b34224862549
Former-commit-id: 5e48cfdd9d
[formerly ee3550654b
] [formerly 5e48cfdd9d
[formerly ee3550654b
] [formerly 687e64dc29
[formerly e5d5ceb52ab2a0306c313169dddd71cf4368de17]]]
Former-commit-id: 687e64dc29
Former-commit-id: a97cd93f95
[formerly db35be851e
]
Former-commit-id: 729678f323
2013-10-02 15:30:52 -05:00
Nate Jensen
a0340f2a82
Merge "Issue #2404 move grid reprojection style rules to common." into development
...
Former-commit-id: 028165eace
[formerly 4564a94369
] [formerly 028165eace
[formerly 4564a94369
] [formerly 6bc326b8d1
[formerly 942bc0600576cd0d322c4e82748ac6fbffc0548e]]]
Former-commit-id: 6bc326b8d1
Former-commit-id: 14d7cc21e1
[formerly d7a8341832
]
Former-commit-id: 549f2b33ba
2013-10-02 11:21:04 -05:00
Nate Jensen
8291074794
Merge "Issue #2296 - Change email recipients of unit test failure email." into development
...
Former-commit-id: 5eeb64c356
[formerly 708ac85c7c
] [formerly 5eeb64c356
[formerly 708ac85c7c
] [formerly 5dc4dbb431
[formerly 4f46993c19c9479541ec009469e00f2060e408a3]]]
Former-commit-id: 5dc4dbb431
Former-commit-id: dd9d517f56
[formerly f67efb2b78
]
Former-commit-id: cc3c0e95df
2013-10-02 11:20:54 -05:00
Ben Steffensmeier
ff28df9bbc
Issue #2404 move grid reprojection style rules to common.
...
Former-commit-id: a95f0dbac4
[formerly a75361ad34
] [formerly a95f0dbac4
[formerly a75361ad34
] [formerly 32a01070f9
[formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]]]
Former-commit-id: 32a01070f9
Former-commit-id: 95b1c01650
[formerly 59d7c79c20
]
Former-commit-id: dc4c07c194
2013-10-02 10:33:23 -05:00
Mike Duff
387865a9fc
Issue #2296 - Change email recipients of unit test failure email.
...
Change-Id: I17338a82fd97a12eaafc1b64a91ebe35de1fb270
Former-commit-id: 425ce97978
[formerly 7072b53ba5
] [formerly 425ce97978
[formerly 7072b53ba5
] [formerly 77c2043a1a
[formerly 466b16f5052e3a848980976cfbdcf5dff95673c9]]]
Former-commit-id: 77c2043a1a
Former-commit-id: 35c44291e0
[formerly 229637bf7a
]
Former-commit-id: 076da5b3f3
2013-10-02 09:54:16 -05:00
Nate Jensen
c18e9ee060
Issue #2361 remove XML annotations from localization requests/responses
...
Change-Id: Ia2aa791f7e68524d19f24522c7824a977d25d58f
Former-commit-id: 8e17babd91
[formerly dd75847b7b
] [formerly 8e17babd91
[formerly dd75847b7b
] [formerly 396e69180d
[formerly ef569f59ca91c73cfbfad4b062fb0110d33533d3]]]
Former-commit-id: 396e69180d
Former-commit-id: 28ce7782fe
[formerly 3b92de5abc
]
Former-commit-id: 38edfa0d07
2013-10-02 09:09:26 -05:00
Roger Ferrel
efde4f9297
Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
...
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859
Former-commit-id: 2ba7117d13
[formerly a76fc08e93
] [formerly 2ba7117d13
[formerly a76fc08e93
] [formerly e65b8a9f6e
[formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: 34ea90f18a
[formerly 71737f069d
]
Former-commit-id: 0d86e00182
2013-10-01 16:36:34 -05:00
Steve Harris
160a5819f9
Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
...
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/python.site-packages/Installer.qpid/component.spec
kept the omaha_14.1.1 versions of the .so files
Former-commit-id: 59f753ee0d
[formerly fc0cdf4996
] [formerly 59f753ee0d
[formerly fc0cdf4996
] [formerly 84ad96f2e0
[formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: c2fa80310e
[formerly c6a4241c5b
]
Former-commit-id: 9aa19b42b5
2013-10-01 15:34:01 -05:00
Richard Peter
541ff7c791
Merge "Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive." into omaha_13.5.3
...
Former-commit-id: 5a3d77f26f
[formerly 463c07c3de
] [formerly 5a3d77f26f
[formerly 463c07c3de
] [formerly 59061263d2
[formerly 3180544d195f49196e842ddf68d1dd6f71872b18]]]
Former-commit-id: 59061263d2
Former-commit-id: 33a53e5b2a
[formerly 7309d7d836
]
Former-commit-id: 2a86df5796
2013-10-01 15:31:12 -05:00
Nate Jensen
580f3be05d
Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
...
Former-commit-id: 68c8f9addd
[formerly 265b6e7e61
] [formerly 68c8f9addd
[formerly 265b6e7e61
] [formerly 6cd79464ef
[formerly 33899872714e8b945131bc17eab63bc71af38d37]]]
Former-commit-id: 6cd79464ef
Former-commit-id: c4018373f1
[formerly 64d66cf406
]
Former-commit-id: ff27201982
2013-10-01 15:19:56 -05:00
Richard Peter
86c28e6e16
Merge branch 'omaha_13.5.3' (13.5.2-7) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50
Former-commit-id: 75b0f19d87
[formerly bb9488bb92
] [formerly 75b0f19d87
[formerly bb9488bb92
] [formerly f4e71b65d3
[formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 3514194d3b
[formerly 39ae6d437d
]
Former-commit-id: ddf07f8030
2013-10-01 15:06:34 -05:00
Richard Peter
32dd0fedc1
Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml
Former-commit-id: 984785ce5e
[formerly e45689dbc7
] [formerly 984785ce5e
[formerly e45689dbc7
] [formerly add32a774f
[formerly b118718cd8766cf83df1a02079f92636964ca09e]]]
Former-commit-id: add32a774f
Former-commit-id: aa2eda2c38
[formerly c178e4543a
]
Former-commit-id: 06737e3fa2
2013-10-01 14:22:33 -05:00
Richard Peter
b6b92e0ff1
Merge "Issue #2191 Fixing Registry Federation" into development
...
Former-commit-id: f1dbe103ee
[formerly 50ce059677
] [formerly f1dbe103ee
[formerly 50ce059677
] [formerly eefbfee6fc
[formerly 97ab04bce3db7f2f2e19d310da5b696e2a860d55]]]
Former-commit-id: eefbfee6fc
Former-commit-id: 8e429ae579
[formerly 14b1fcc763
]
Former-commit-id: ed261ea1a5
2013-10-01 13:07:47 -05:00
Nate Jensen
0c92f4eca1
Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
...
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7
Former-commit-id: f529c077c6
[formerly effa4f4f26
] [formerly f529c077c6
[formerly effa4f4f26
] [formerly 3e7dc7782f
[formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: e1c35952c9
[formerly 4e6f5afc57
]
Former-commit-id: 593700bd28
2013-10-01 11:25:45 -05:00
Bryan Kowal
7bd9ea3d30
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: bb5acf7c11
[formerly c125b5b053
] [formerly bb5acf7c11
[formerly c125b5b053
] [formerly 9829477ced
[formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]
Former-commit-id: 9829477ced
Former-commit-id: 0f825df590
[formerly ef789bf912
]
Former-commit-id: 0efd4c7c50
2013-09-30 18:00:31 -05:00
Roger Ferrel
d5626a0591
Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive.
...
Change-Id: I00ab0a44e37d4e9898aa256f4963c34ed8ae1f48
Former-commit-id: 93ce65763e
[formerly e8be9f980a
] [formerly 93ce65763e
[formerly e8be9f980a
] [formerly 546c051e35
[formerly 482b253e94e069ae82507e22a94213342b1b92e6]]]
Former-commit-id: 546c051e35
Former-commit-id: 3466232f8d
[formerly f01f8e9eb4
]
Former-commit-id: 213127601d
2013-09-30 16:45:32 -05:00