xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2815 commits 31 branches 40 tags 3.8 GiB
Commit graph

2815 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
e4bbe70d57 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh 
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 927da5cffb [formerly 99b4a21414] [formerly 927da5cffb [formerly 99b4a21414] [formerly 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: b025262dc1 [formerly a1f314948f]
Former-commit-id: 4eb941dacb
 2013-05-29 14:49:43 -05:00
Nate Jensen
121dd032bf Issue #1989 remove high memory mode, reorganize wrapper.conf 
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 7059967ae9 [formerly caf414bab0] [formerly 7059967ae9 [formerly caf414bab0] [formerly 148b20f57c [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 47d2bf99b9 [formerly 72ed3e21b3]
Former-commit-id: 1fe16c9553
 2013-05-29 12:06:15 -05:00
Benjamin Phillippe
a75821e0a6 Issue #2036 Implemented federated query capabilities 
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: e16dc02a54 [formerly 4747f7d319] [formerly e16dc02a54 [formerly 4747f7d319] [formerly d5263b2b75 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]
Former-commit-id: d5263b2b75
Former-commit-id: c6af8b4d7c [formerly 7cca4d8794]
Former-commit-id: c441b20ddb
 2013-05-29 10:34:22 -05:00
Dustin Johnson
233d827c9c Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development 
Former-commit-id: 7ca6f18405 [formerly 66c941fc3f] [formerly 7ca6f18405 [formerly 66c941fc3f] [formerly ac292f1242 [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: b6c87f42b1 [formerly ef43634c56]
Former-commit-id: bae8a2436d
 2013-05-29 09:27:30 -05:00
Richard Peter
6ceeb324e1 Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development 
Former-commit-id: 6dd22b6dfa [formerly bc0f1c88fc] [formerly 6dd22b6dfa [formerly bc0f1c88fc] [formerly 19272c9f28 [formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]]
Former-commit-id: 19272c9f28
Former-commit-id: d26eac7bdf [formerly 4be6514b57]
Former-commit-id: 3550d07a9c
 2013-05-29 09:26:10 -05:00
Nate Jensen
f9d85ac8a9 Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables 
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 808ab352c5 [formerly 82d6c03669] [formerly 808ab352c5 [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: 452858b86f [formerly cb4b66d37a]
Former-commit-id: 74081dd140
 2013-05-29 09:20:53 -05:00
Mike Duff
4d43e81158 Issue #2016 - fix TS Trace toggle 
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 51de726e49 [formerly afbe294f4a] [formerly 51de726e49 [formerly afbe294f4a] [formerly 5919687484 [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]
Former-commit-id: 5919687484
Former-commit-id: d9fd9d297b [formerly 66f4e6fe87]
Former-commit-id: 5e3fa8852b
 2013-05-29 09:15:46 -05:00
Dustin Johnson
4ac1c2cbdb Issue #2038 More information when bandwidth manager can't schedule a subscription 
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: c76fa3bc2a [formerly 0a9e7ed740] [formerly c76fa3bc2a [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: fff0172786 [formerly 187a1e49ef]
Former-commit-id: 1fab733472
 2013-05-29 09:02:47 -05:00
Nate Jensen
4ac4250fe3 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development 
Former-commit-id: ba5e69c7ff [formerly 7c1e6e8b09] [formerly ba5e69c7ff [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]
Former-commit-id: 256a67a9f9
Former-commit-id: ac838f62dd [formerly 2fe1960ebb]
Former-commit-id: 99a1938d36
 2013-05-28 15:43:31 -05:00
Nate Jensen
95ddeeb10a Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development 
Former-commit-id: cba08666e6 [formerly 053e37ee76] [formerly cba08666e6 [formerly 053e37ee76] [formerly e846e539fb [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]
Former-commit-id: e846e539fb
Former-commit-id: 607e980d45 [formerly 5c60582df2]
Former-commit-id: f1b34d9fdd
 2013-05-28 15:43:23 -05:00
Max Schenkelberg
062c4e90cd Issue #1638 Fixed text box drawn to be correct size with padding around text 
Amend: Fixed format string issues with topo resource and colorbar labels

Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114

Former-commit-id: a88ca5e983 [formerly 13ff44fdee] [formerly a88ca5e983 [formerly 13ff44fdee] [formerly 3175563336 [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]
Former-commit-id: 3175563336
Former-commit-id: 4e8d25b317 [formerly 9932114218]
Former-commit-id: b3bae339be
 2013-05-28 15:00:59 -05:00
Nate Jensen
4469346bc5 Issue #1967 fix annoying warnings, remove unused preferences page 
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: bd8431b986 [formerly ed7b0fc8c5] [formerly bd8431b986 [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: f7817d7c41 [formerly 0b48f54f47]
Former-commit-id: e7f6bee025
 2013-05-28 14:30:26 -05:00
Roger Ferrel
60820cf776 Issue #1966 Changes to CategoryConfig to make parsing more efficent. 
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 365af6b7ce [formerly cbee731447] [formerly 365af6b7ce [formerly cbee731447] [formerly 9263b54845 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]
Former-commit-id: 9263b54845
Former-commit-id: 838eacc802 [formerly fce5c2ca1e]
Former-commit-id: a5db5a53b3
 2013-05-28 13:21:08 -05:00
Max Schenkelberg
0cb45bc6c9 Issue #1638 Added support for null search constraints for updates 
Amend: Fixed comment, added SW history

Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515

Former-commit-id: 21693d6913 [formerly 1bc4437154] [formerly 21693d6913 [formerly 1bc4437154] [formerly 807e4501c8 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]]
Former-commit-id: 807e4501c8
Former-commit-id: 6c9fedb312 [formerly 036b11c84e]
Former-commit-id: bafad63987
 2013-05-28 12:59:27 -05:00
Nate Jensen
1ee22de2db Issue #2037 made imageMap concurrent to fix memory leak 
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: 84444b6ba9 [formerly f77f350eb3] [formerly 84444b6ba9 [formerly f77f350eb3] [formerly 68eba61c28 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]]
Former-commit-id: 68eba61c28
Former-commit-id: 50d981285d [formerly af7fcf7e8e]
Former-commit-id: 95371e7ec0
 2013-05-28 09:21:57 -05:00
Dustin Johnson
834ffed160 Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development 
Former-commit-id: f4ad0218f2 [formerly 2b1f75f702] [formerly f4ad0218f2 [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]
Former-commit-id: 197a5cef1b
Former-commit-id: 8d00ba1978 [formerly a8fc7295ef]
Former-commit-id: 19274fb903
 2013-05-28 06:43:35 -05:00
Ben Steffensmeier
c0e3037695 Issue #1869 Fix unique checking for things without dataURI and with subtables. 
Former-commit-id: cdf8e7daaa [formerly 3b6156843e] [formerly cdf8e7daaa [formerly 3b6156843e] [formerly 7be9ad1f8b [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]]
Former-commit-id: 7be9ad1f8b
Former-commit-id: c71afc4198 [formerly 2a8a87e564]
Former-commit-id: b7014d1570
 2013-05-24 16:40:21 -05:00
Mike Duff
5b21a6cfa4 Issue #2020 - Implement Shared Subscriptions Cave-side. 
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: 80b1f95f0c [formerly 192ce891d0] [formerly 80b1f95f0c [formerly 192ce891d0] [formerly b6b01c3e81 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]
Former-commit-id: b6b01c3e81
Former-commit-id: 6ee0ef55ff [formerly a9004667b7]
Former-commit-id: 53ca005836
 2013-05-24 09:20:55 -05:00
Nate Jensen
afcf650681 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart 
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Former-commit-id: 631567ced9 [formerly 7d1fc954f6] [formerly 631567ced9 [formerly 7d1fc954f6] [formerly 7d233ff590 [formerly ef313253ec669167b9e1deb2562170c117123937]]]
Former-commit-id: 7d233ff590
Former-commit-id: e976a4c94e [formerly 9e37d21dc6]
Former-commit-id: 543e0c7746
 2013-05-24 09:13:10 -05:00
Bryan Kowal
8998e5cb8f Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline 
Amend: do not run the clean task after building any wa features

Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a

Former-commit-id: b3d40951ba [formerly 8145305580] [formerly b3d40951ba [formerly 8145305580] [formerly a2148650b4 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]]
Former-commit-id: a2148650b4
Former-commit-id: c658131c84 [formerly 66cf28ab84]
Former-commit-id: 9392da9041
 2013-05-23 23:52:35 -05:00
Lee Venable
9a6c295b62 Issue #1964 - inital GUI creation 
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: 4ecb65e4a2 [formerly ae020d3960] [formerly 4ecb65e4a2 [formerly ae020d3960] [formerly c3328077c8 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]]
Former-commit-id: c3328077c8
Former-commit-id: 041d612ea2 [formerly 9a72abf083]
Former-commit-id: eb7c8a4d93
 2013-05-23 17:16:31 -05:00
Roger Ferrel
a5378d6ba7 Issue #1966 Feature plugin for archive. 
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

Former-commit-id: 75a2fc4723 [formerly 9533bb686d] [formerly 75a2fc4723 [formerly 9533bb686d] [formerly e5867cbb79 [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]]
Former-commit-id: e5867cbb79
Former-commit-id: ef14a57411 [formerly bdecc2f309]
Former-commit-id: 9b90237bcf
 2013-05-23 13:43:53 -05:00
Nate Jensen
eaaf8d1b8a Issue #1989 remove activemq references from spring xml, fix deprecated javadoc 
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: b7cecb931e [formerly 1978133177] [formerly b7cecb931e [formerly 1978133177] [formerly 1fd2f8965f [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: a84a6fe6ae [formerly 49b20e5d20]
Former-commit-id: 9689640192
 2013-05-23 11:20:40 -05:00
Nate Jensen
7843d83e0d Merge "Issue #1989 use camel's built-in DirectVm component" into development 
Former-commit-id: 876d741ab8 [formerly b8f3307f50] [formerly 876d741ab8 [formerly b8f3307f50] [formerly 3b058175fe [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]]
Former-commit-id: 3b058175fe
Former-commit-id: 3287b6ace2 [formerly 71d9076fe2]
Former-commit-id: 41403a55ed
 2013-05-23 10:43:15 -05:00
Richard Peter
3d65441ec4 Merge "Issue #1989 fix clustered routes suspending/starting" into development 
Former-commit-id: edd70dfe47 [formerly 57933400b9] [formerly edd70dfe47 [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: e150a51871 [formerly 7a02b90690]
Former-commit-id: 6660e05379
 2013-05-23 10:10:51 -05:00
Nate Jensen
73290b1bb6 Issue #1989 use camel's built-in DirectVm component 
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 65b9bafed7 [formerly d74936ef3e] [formerly 65b9bafed7 [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: 882296f823 [formerly 91c8b9ac1d]
Former-commit-id: 0f319b9721
 2013-05-23 10:06:28 -05:00
Greg Armendariz
e5c6e02f05 Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development 
Former-commit-id: 8cf9ef2527 [formerly 2089732453] [formerly 8cf9ef2527 [formerly 2089732453] [formerly db8cf0d35f [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]]
Former-commit-id: db8cf0d35f
Former-commit-id: c7e028a6ff [formerly 287f078150]
Former-commit-id: ba12811ed9
 2013-05-23 09:10:41 -05:00
Greg Armendariz
b0e11947dd Merge "Issue #1927 - patch ant includegen task" into development 
Former-commit-id: dc9623df11 [formerly 2fe2b0c5fb] [formerly dc9623df11 [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]
Former-commit-id: a4457f8c83
Former-commit-id: 7c97422501 [formerly 270269219c]
Former-commit-id: 28475200b6
 2013-05-23 09:10:11 -05:00
Lee Venable
236e7b39db Merge "Issue #1966 Feature place holders for the dialogs." into development 
Former-commit-id: 6e7ed9e02b [formerly cb156533f4] [formerly 6e7ed9e02b [formerly cb156533f4] [formerly 7245dff8b9 [formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]]
Former-commit-id: 7245dff8b9
Former-commit-id: a551d4b586 [formerly 8b13517100]
Former-commit-id: 415d9b74f7
 2013-05-23 09:05:11 -05:00
Richard Peter
e54a8c5c78 Merge "Issue #1965 Add org.apache.commons.io package to cots." into development 
Former-commit-id: 895866b6d9 [formerly df415f7088] [formerly 895866b6d9 [formerly df415f7088] [formerly 041c0ad948 [formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]]
Former-commit-id: 041c0ad948
Former-commit-id: b28bb05fde [formerly 08f45fe832]
Former-commit-id: 7f4e17f1ae
 2013-05-23 08:52:47 -05:00
Roger Ferrel
3ac1658261 Issue #1966 Feature place holders for the dialogs. 
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: d7e7a56b84 [formerly e55f73b4f7] [formerly d7e7a56b84 [formerly e55f73b4f7] [formerly d35424df4f [formerly 04684460d021089818509726b1dd23d53fb90440]]]
Former-commit-id: d35424df4f
Former-commit-id: 760b0f3366 [formerly 2d4434119d]
Former-commit-id: 6d3604e629
 2013-05-23 07:36:15 -05:00
Bryan Kowal
27ad63100f Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui 
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8

Former-commit-id: 73dfc7a5e1 [formerly bfd08efaa9] [formerly 73dfc7a5e1 [formerly bfd08efaa9] [formerly 8061922b70 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]
Former-commit-id: 8061922b70
Former-commit-id: 1469cb15d6 [formerly 83c1e3127e]
Former-commit-id: f13a7f7ca5
 2013-05-22 22:34:45 -05:00
Bryan Kowal
58b7ec2195 Issue #1927 - patch ant includegen task 
Former-commit-id: 575944f70d [formerly 40e8f544ea] [formerly 575944f70d [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]
Former-commit-id: 24c0728db9
Former-commit-id: e6cfad1759 [formerly 2a17b35e83]
Former-commit-id: 897c70d90c
 2013-05-22 18:00:43 -05:00
Nate Jensen
0b6011bc36 Issue #1989 fix clustered routes suspending/starting 
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: 57e560b745 [formerly 4ab1d90d67] [formerly 57e560b745 [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]
Former-commit-id: a6d525ec96
Former-commit-id: 5525412779 [formerly 431e97742d]
Former-commit-id: f1bef6a3ac
 2013-05-22 16:39:24 -05:00
Steve Harris
61debd93bf Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 570128b986 [formerly 8496832064] [formerly 570128b986 [formerly 8496832064] [formerly 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 389eefd1f9 [formerly 0f9e0b343d]
Former-commit-id: c184d31779
 2013-05-22 16:13:08 -05:00
Steve Harris
6dbe80b1af Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: dce0dc3692 [formerly 097617fa26] [formerly dce0dc3692 [formerly 097617fa26] [formerly 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 026674d0b2 [formerly 299690a202]
Former-commit-id: bd9b2e493e
 2013-05-22 16:10:04 -05:00
Steve Harris
71e13c4d4d 13.4.1-12 baseline 
Former-commit-id: 397bbf674a [formerly 6a97b4325a] [formerly 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: b745b332ae [formerly bd4f93e859]
Former-commit-id: 0d9e71aee2
 2013-05-22 16:42:39 -04:00
Benjamin Phillippe
1b42f5d177 Issue #2022 Removed data delivery project from feature 
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd

Former-commit-id: 0308f217d6 [formerly 4d1252523e] [formerly 0308f217d6 [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]]
Former-commit-id: 3e9fe9892e
Former-commit-id: 8cae1b56f1 [formerly ce20ead9e7]
Former-commit-id: c77d747199
 2013-05-22 12:49:46 -05:00
David Gillingham
016ea4ec14 Issue #1759: Fix regression to ISC request reply due to missing import. 
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 2555cf9819 [formerly 5cba0f5e40] [formerly 2555cf9819 [formerly 5cba0f5e40] [formerly 801c659108 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]
Former-commit-id: 801c659108
Former-commit-id: 1471a7fa34 [formerly 60aeb71652]
Former-commit-id: dca867b77c
 2013-05-22 11:42:08 -05:00
Benjamin Phillippe
bb8c38e9c0 Issue #2022 Added registry federation capabilities 
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: 7a908bbeaf [formerly b9f2bde20e] [formerly 7a908bbeaf [formerly b9f2bde20e] [formerly c3a376475b [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]]
Former-commit-id: c3a376475b
Former-commit-id: 1c50a8b9d3 [formerly ad039bae0c]
Former-commit-id: 5fe0928121
 2013-05-22 11:38:42 -05:00
Brad Gonzales
52b1009539 Issue #1965 Add org.apache.commons.io package to cots. 
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed

Former-commit-id: 33045d73a6 [formerly 4bc98160ab] [formerly 33045d73a6 [formerly 4bc98160ab] [formerly 598a7a221e [formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]]
Former-commit-id: 598a7a221e
Former-commit-id: 6d483764e3 [formerly 858f68fc5c]
Former-commit-id: 0edf6a9b5e
 2013-05-21 16:29:01 -05:00
Richard Peter
7d73a32b0a Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development 
Former-commit-id: 62c8176486 [formerly c9c1570960] [formerly 62c8176486 [formerly c9c1570960] [formerly b4344d3c04 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]
Former-commit-id: b4344d3c04
Former-commit-id: 1bbddf8fdf [formerly 489fdf49b1]
Former-commit-id: b3688d78d1
 2013-05-21 13:07:51 -05:00
Greg Armendariz
8c4a634c5a Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development 
Former-commit-id: fce1512b37 [formerly 20a9ad95e5] [formerly fce1512b37 [formerly 20a9ad95e5] [formerly eecbf2718a [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]]
Former-commit-id: eecbf2718a
Former-commit-id: cd96d6d2e6 [formerly 525cd5c751]
Former-commit-id: 065e9bd1f9
 2013-05-21 12:24:19 -05:00
Richard Peter
7966576f23 Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 76f11f00ae [formerly 81ae3ea8bf]
Former-commit-id: 046de916fd
 2013-05-21 12:11:21 -05:00
Bryan Kowal
f1b7607385 Issue #1952 - remove duplicate filesystem hierarchy 
Former-commit-id: e9abe7185b [formerly 4b8868ca54] [formerly e9abe7185b [formerly 4b8868ca54] [formerly 7027f97e2a [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]]
Former-commit-id: 7027f97e2a
Former-commit-id: 61a613b490 [formerly 62d21498a6]
Former-commit-id: 1052f6cd98
 2013-05-21 11:09:57 -05:00
Nate Jensen
741abd24bb Merge "Issue #2001 fix message handling" into development 
Former-commit-id: 8438eb1b4a [formerly 737b265c34] [formerly 8438eb1b4a [formerly 737b265c34] [formerly 4d519da3a9 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]]]
Former-commit-id: 4d519da3a9
Former-commit-id: 0fc260728b [formerly d2cccd342b]
Former-commit-id: 9ef848d0c7
 2013-05-21 11:00:32 -05:00
Richard Peter
2a8115770f Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: 4809b3c15b [formerly 73372622f7] [formerly 4809b3c15b [formerly 73372622f7] [formerly 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 21b87e9ea7 [formerly 427f54a878]
Former-commit-id: 69e6ea4847
 2013-05-21 10:35:00 -05:00
Nate Jensen
c183650ebd Issue #2001 fix message handling 
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: 56309efafe [formerly 1ab118958f] [formerly 56309efafe [formerly 1ab118958f] [formerly 960bc6db69 [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: a06bb176ba [formerly e575c19ab6]
Former-commit-id: 942855e9f8
 2013-05-21 10:26:18 -05:00
Nate Jensen
256721e481 Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development 
Former-commit-id: 18e6f84418 [formerly f16606cfba] [formerly 18e6f84418 [formerly f16606cfba] [formerly d02ce9d389 [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]]
Former-commit-id: d02ce9d389
Former-commit-id: 51a31a08ca [formerly 80b1a9d18c]
Former-commit-id: d19e7f9c39
 2013-05-21 10:22:24 -05:00
Dustin Johnson
2cf8ffac1a Merge "Issue #2000 Subscription overlap configuration GUI" into development 
Former-commit-id: fef73ac960 [formerly 195cd5f210] [formerly fef73ac960 [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: bd65447c9f [formerly 5695c4f967]
Former-commit-id: 566273cf69
 2013-05-21 08:19:34 -05:00