Nate Jensen
|
8ffb2ea001
|
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: 86e8118e80 [formerly cf705759bd] [formerly 808ab352c5] [formerly 808ab352c5 [formerly 82d6c03669]] [formerly 36bc35b5c8 [formerly 808ab352c5 [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: b557c833e2207e4cf3d25b652e062c921efb4111 [formerly db577cfe4bfa8cdfe3ef347e55233cf887e454bd] [formerly 452858b86f [formerly cb4b66d37a]]
Former-commit-id: 452858b86f
Former-commit-id: 768a7dad60
|
2013-05-29 09:20:53 -05:00 |
|
Mike Duff
|
40d7b22f6e
|
Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: ce004f60f7 [formerly 0babd4d9b4] [formerly 51de726e49] [formerly 51de726e49 [formerly afbe294f4a]] [formerly 5919687484 [formerly 51de726e49 [formerly afbe294f4a] [formerly 5919687484 [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]]
Former-commit-id: 5919687484
Former-commit-id: dfc66a1f441f48ee1d1085470fee480aa4373e11 [formerly 22647bf8f0aa609c257a8ef84d9b763053337b5e] [formerly d9fd9d297b [formerly 66f4e6fe87]]
Former-commit-id: d9fd9d297b
Former-commit-id: d292cfcca0
|
2013-05-29 09:15:46 -05:00 |
|
Dustin Johnson
|
5f52d1c153
|
Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: 724d8f6bf5 [formerly eef3b4c750] [formerly c76fa3bc2a] [formerly c76fa3bc2a [formerly 0a9e7ed740]] [formerly 31e01a9f9a [formerly c76fa3bc2a [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: 83eb35c2695f4dc88ae18025e8398b0f386b7e13 [formerly c0c794b2f4803e4344ff77a743a2e92ff060ff70] [formerly fff0172786 [formerly 187a1e49ef]]
Former-commit-id: fff0172786
Former-commit-id: fb15a3e115
|
2013-05-29 09:02:47 -05:00 |
|
Nate Jensen
|
7e82826424
|
Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: c9dda334af [formerly d7391928f9] [formerly ba5e69c7ff] [formerly ba5e69c7ff [formerly 7c1e6e8b09]] [formerly 256a67a9f9 [formerly ba5e69c7ff [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]]
Former-commit-id: 256a67a9f9
Former-commit-id: 0b0668c98a9769d01c96cda25bf7cb7817363e2c [formerly 729de173162ed2d04e927cd7b463d674c8aac59e] [formerly ac838f62dd [formerly 2fe1960ebb]]
Former-commit-id: ac838f62dd
Former-commit-id: 8c756705c5
|
2013-05-28 15:43:31 -05:00 |
|
Nate Jensen
|
5c8152d1fb
|
Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: a74a91a138 [formerly 5748201316] [formerly cba08666e6] [formerly cba08666e6 [formerly 053e37ee76]] [formerly e846e539fb [formerly cba08666e6 [formerly 053e37ee76] [formerly e846e539fb [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]]
Former-commit-id: e846e539fb
Former-commit-id: 22b37aa47ec3f4001ab9d37fa3bf9f174be2efbf [formerly 00638cbac9800172a1c3e7bb571d3fdb66dc2446] [formerly 607e980d45 [formerly 5c60582df2]]
Former-commit-id: 607e980d45
Former-commit-id: 74bce32a88
|
2013-05-28 15:43:23 -05:00 |
|
Max Schenkelberg
|
65aff36dc4
|
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: 51716693ef [formerly 98bdd5f786] [formerly a88ca5e983] [formerly a88ca5e983 [formerly 13ff44fdee]] [formerly 3175563336 [formerly a88ca5e983 [formerly 13ff44fdee] [formerly 3175563336 [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]]
Former-commit-id: 3175563336
Former-commit-id: 233abc8277e10316eb75c7306b36c14c62f18484 [formerly dd33ea8ed195002c13b9b3e4e8d6d9dda70e2d8e] [formerly 4e8d25b317 [formerly 9932114218]]
Former-commit-id: 4e8d25b317
Former-commit-id: b2a9cba9c7
|
2013-05-28 15:00:59 -05:00 |
|
Nate Jensen
|
4ee2480b30
|
Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0
Former-commit-id: 0adbbaf8cd [formerly d479912981] [formerly bd8431b986] [formerly bd8431b986 [formerly ed7b0fc8c5]] [formerly 3f85aeb00a [formerly bd8431b986 [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 65f1fb5d1fed10370d97d96c9355f326f34fd587 [formerly 755dd253bb4939ea763815cd0328c8e0a0f2daca] [formerly f7817d7c41 [formerly 0b48f54f47]]
Former-commit-id: f7817d7c41
Former-commit-id: e94a5b5494
|
2013-05-28 14:30:26 -05:00 |
|
Roger Ferrel
|
589be27351
|
Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87
Former-commit-id: 00ed24f081 [formerly 24f1c70168] [formerly 365af6b7ce] [formerly 365af6b7ce [formerly cbee731447]] [formerly 9263b54845 [formerly 365af6b7ce [formerly cbee731447] [formerly 9263b54845 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]]
Former-commit-id: 9263b54845
Former-commit-id: c9d911bbb8ab90460a3b74ae86b587cc4b8858b4 [formerly e443885c0974b7dc457a2ea698d05b926b780848] [formerly 838eacc802 [formerly fce5c2ca1e]]
Former-commit-id: 838eacc802
Former-commit-id: 618feeda6d
|
2013-05-28 13:21:08 -05:00 |
|
Max Schenkelberg
|
f4c6efa78e
|
Issue #1638 Added support for null search constraints for updates
Amend: Fixed comment, added SW history
Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515
Former-commit-id: d3ab7ad551 [formerly a91db9c1e3] [formerly 21693d6913] [formerly 21693d6913 [formerly 1bc4437154]] [formerly 807e4501c8 [formerly 21693d6913 [formerly 1bc4437154] [formerly 807e4501c8 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]]]
Former-commit-id: 807e4501c8
Former-commit-id: 3a9bc4a5222fbe39aef03926f56e23f87fda8690 [formerly 1bee1ded94bdf16e7d08cd81e11f8d384dfa0585] [formerly 6c9fedb312 [formerly 036b11c84e]]
Former-commit-id: 6c9fedb312
Former-commit-id: ae669fec59
|
2013-05-28 12:59:27 -05:00 |
|
Nate Jensen
|
de008ee96a
|
Issue #2037 made imageMap concurrent to fix memory leak
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f
Former-commit-id: d3e65122d9 [formerly e3caafe7ad] [formerly 84444b6ba9] [formerly 84444b6ba9 [formerly f77f350eb3]] [formerly 68eba61c28 [formerly 84444b6ba9 [formerly f77f350eb3] [formerly 68eba61c28 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]]]
Former-commit-id: 68eba61c28
Former-commit-id: 5f8c9dc62390bf0a040ef8a6180f5f1ac395f4cf [formerly 6b1d9083d66d59225023a96ec8b6bbd68b7d1d44] [formerly 50d981285d [formerly af7fcf7e8e]]
Former-commit-id: 50d981285d
Former-commit-id: 4cb8b766b5
|
2013-05-28 09:21:57 -05:00 |
|
Dustin Johnson
|
186978daad
|
Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: 414ee2f2c4 [formerly c694d523db] [formerly f4ad0218f2] [formerly f4ad0218f2 [formerly 2b1f75f702]] [formerly 197a5cef1b [formerly f4ad0218f2 [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]]
Former-commit-id: 197a5cef1b
Former-commit-id: 037816aeaed99d110e41213be83c2fadbd606dfa [formerly 5e3e07d672821d4ad14f8aa22c072b6f5438ab36] [formerly 8d00ba1978 [formerly a8fc7295ef]]
Former-commit-id: 8d00ba1978
Former-commit-id: d8cdc3c8c5
|
2013-05-28 06:43:35 -05:00 |
|
Ben Steffensmeier
|
d8c70faf5e
|
Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: 35328c607a [formerly c2ca1551f6] [formerly cdf8e7daaa] [formerly 37df42633ad7fbcc51bf28d03f3ac6f82040b570 [formerly cdf8e7daaa [formerly 3b6156843e]]] [formerly 7be9ad1f8b [formerly cdf8e7daaa [formerly 3b6156843e] [formerly 7be9ad1f8b [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]]]
Former-commit-id: 7be9ad1f8b
Former-commit-id: e3b72e53c26fd7e4fcf3daba6ec67ac7204ec08d [formerly dc6540df2c7c7dee778134e44e92281971fe7bb5] [formerly c71afc4198 [formerly 2a8a87e564]]
Former-commit-id: c71afc4198
Former-commit-id: 84eac56ea0
|
2013-05-24 16:40:21 -05:00 |
|
Mike Duff
|
c5c31e2115
|
Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: 011b781bb7 [formerly e3804d48ec] [formerly 80b1f95f0c] [formerly 9cee487b71f7329909bd95a36c355637b4bb4978 [formerly 80b1f95f0c [formerly 192ce891d0]]] [formerly b6b01c3e81 [formerly 80b1f95f0c [formerly 192ce891d0] [formerly b6b01c3e81 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]]
Former-commit-id: b6b01c3e81
Former-commit-id: 2684dc4ab1a2a36d959484c97070f16c34925d8a [formerly bbd9728434e2386f696b8016882158b60232d706] [formerly 6ee0ef55ff [formerly a9004667b7]]
Former-commit-id: 6ee0ef55ff
Former-commit-id: e7790088ac
|
2013-05-24 09:20:55 -05:00 |
|
Nate Jensen
|
8c3a197ff1
|
Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53
Former-commit-id: ca2b8244cc [formerly 29b3e508e2] [formerly 631567ced9] [formerly 631567ced9 [formerly 7d1fc954f6]] [formerly 7d233ff590 [formerly 631567ced9 [formerly 7d1fc954f6] [formerly 7d233ff590 [formerly ef313253ec669167b9e1deb2562170c117123937]]]]
Former-commit-id: 7d233ff590
Former-commit-id: 9ea35199f74cd6dd979f073e4812a4e6370163fa [formerly 6b94d7fe2342db507b4bed04b7cd4e98b8e66316] [formerly e976a4c94e [formerly 9e37d21dc6]]
Former-commit-id: e976a4c94e
Former-commit-id: 7fa0ba3069
|
2013-05-24 09:13:10 -05:00 |
|
Bryan Kowal
|
cc3f714dba
|
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: 1f3d9f444c [formerly 45c9e4d203] [formerly b3d40951ba] [formerly b3d40951ba [formerly 8145305580]] [formerly a2148650b4 [formerly b3d40951ba [formerly 8145305580] [formerly a2148650b4 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]]]
Former-commit-id: a2148650b4
Former-commit-id: 7199fbbf11373ded1b4aa85219164a11f81008a4 [formerly ee8cf990b046e62c310f31e4215068b2761e859e] [formerly c658131c84 [formerly 66cf28ab84]]
Former-commit-id: c658131c84
Former-commit-id: 1f0ad9a4a0
|
2013-05-23 23:52:35 -05:00 |
|
Lee Venable
|
24b266eb21
|
Issue #1964 - inital GUI creation
Change-Id: I47d58880066fa2ef284e8911390163624b873381
Former-commit-id: 32e975d2c1 [formerly 082df6ccd5] [formerly 4ecb65e4a2] [formerly 4ecb65e4a2 [formerly ae020d3960]] [formerly c3328077c8 [formerly 4ecb65e4a2 [formerly ae020d3960] [formerly c3328077c8 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]]]
Former-commit-id: c3328077c8
Former-commit-id: 6238476690741bdc12c7f2a0523c66767cb37a5b [formerly b12a8641a04e64e274355ad4f613a4d32ce96f80] [formerly 041d612ea2 [formerly 9a72abf083]]
Former-commit-id: 041d612ea2
Former-commit-id: dea017445b
|
2013-05-23 17:16:31 -05:00 |
|
Roger Ferrel
|
26f1f47006
|
Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771
Former-commit-id: fcaf33e39f [formerly ff1dac4143] [formerly 75a2fc4723] [formerly 75a2fc4723 [formerly 9533bb686d]] [formerly e5867cbb79 [formerly 75a2fc4723 [formerly 9533bb686d] [formerly e5867cbb79 [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]]]
Former-commit-id: e5867cbb79
Former-commit-id: d3502411fa000ead7b0583059e6b89f45c03fb76 [formerly 3c4155b82503781781c7dbf83bdca26072bfdbec] [formerly ef14a57411 [formerly bdecc2f309]]
Former-commit-id: ef14a57411
Former-commit-id: 2e54bc5af6
|
2013-05-23 13:43:53 -05:00 |
|
Nate Jensen
|
3f549ea9d1
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: 47d9cf1895 [formerly e8ebe1a123] [formerly b7cecb931e] [formerly b7cecb931e [formerly 1978133177]] [formerly 1fd2f8965f [formerly b7cecb931e [formerly 1978133177] [formerly 1fd2f8965f [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 2135b977531ffe2d19a39e7db4a7bf8c643d56e2 [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f] [formerly a84a6fe6ae [formerly 49b20e5d20]]
Former-commit-id: a84a6fe6ae
Former-commit-id: 3b56918970
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
7febf83928
|
Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: 73e97a2152 [formerly d7f5eea402] [formerly 876d741ab8] [formerly 876d741ab8 [formerly b8f3307f50]] [formerly 3b058175fe [formerly 876d741ab8 [formerly b8f3307f50] [formerly 3b058175fe [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]]]
Former-commit-id: 3b058175fe
Former-commit-id: b34e82e24e55ddd9a65c4b08d83577c6cfc8a71d [formerly 8e6e7a123de7f2be6cbdd2bdeddbc88cf44a27ef] [formerly 3287b6ace2 [formerly 71d9076fe2]]
Former-commit-id: 3287b6ace2
Former-commit-id: a9a2c23e23
|
2013-05-23 10:43:15 -05:00 |
|
Richard Peter
|
5aabb8ce37
|
Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 8d04159e37 [formerly 25ace04a31] [formerly edd70dfe47] [formerly edd70dfe47 [formerly 57933400b9]] [formerly 9ca63e7d26 [formerly edd70dfe47 [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: 87eb80f62d0bdbfce0f74f7a94b6caaa9552cd2c [formerly e52295b07065a9723da62e04d0bd89a3ddba7ec9] [formerly e150a51871 [formerly 7a02b90690]]
Former-commit-id: e150a51871
Former-commit-id: b087cac180
|
2013-05-23 10:10:51 -05:00 |
|
Nate Jensen
|
a830887c75
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: c27e8a1fd9 [formerly 4ae00040e3] [formerly 65b9bafed7] [formerly 65b9bafed7 [formerly d74936ef3e]] [formerly d7b8e04bb7 [formerly 65b9bafed7 [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: 66ccac85b6eba085c178c586d287038637a001ac [formerly c6fc510360ab5dfd2d963fcd65966cfc3d7993fa] [formerly 882296f823 [formerly 91c8b9ac1d]]
Former-commit-id: 882296f823
Former-commit-id: b8e6b1a083
|
2013-05-23 10:06:28 -05:00 |
|
Greg Armendariz
|
b080bb44c1
|
Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development
Former-commit-id: 509fd67213 [formerly 362195f3a3] [formerly 8cf9ef2527] [formerly 8cf9ef2527 [formerly 2089732453]] [formerly db8cf0d35f [formerly 8cf9ef2527 [formerly 2089732453] [formerly db8cf0d35f [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]]]
Former-commit-id: db8cf0d35f
Former-commit-id: 423768d37f74a2a6635dff7f7484e32dd30f071d [formerly a53888056ffd5a6cde39461a7854aaf44b0cb313] [formerly c7e028a6ff [formerly 287f078150]]
Former-commit-id: c7e028a6ff
Former-commit-id: ddb7f13f18
|
2013-05-23 09:10:41 -05:00 |
|
Greg Armendariz
|
8242f0a56b
|
Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: 62f973b6aa [formerly cabcb3e574] [formerly dc9623df11] [formerly dc9623df11 [formerly 2fe2b0c5fb]] [formerly a4457f8c83 [formerly dc9623df11 [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]]
Former-commit-id: a4457f8c83
Former-commit-id: e1a7d12c1b8ef9d51c359e9aed1334dae6f92176 [formerly 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e] [formerly 7c97422501 [formerly 270269219c]]
Former-commit-id: 7c97422501
Former-commit-id: 806a417f0f
|
2013-05-23 09:10:11 -05:00 |
|
Matt Nash
|
5b4a1cf35f
|
Issue #1871 fix for 64 bit ints from Python to Java
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae
Former-commit-id: f5bca1de3f [formerly 1ecf5d26af] [formerly bbc7406812] [formerly bbc7406812 [formerly bd64f70d1a]] [formerly 30c7ca8d36 [formerly bbc7406812 [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]]]
Former-commit-id: 30c7ca8d36
Former-commit-id: 3a80de3374ad51318671d10debc8faf80c91bb0a [formerly 98364944a63f530252908f2eab510fc15f4a9823] [formerly 230e3d149e [formerly ca208f913c]]
Former-commit-id: 230e3d149e
Former-commit-id: e9735dc410
|
2013-05-23 09:07:56 -05:00 |
|
Lee Venable
|
5b8400b1dc
|
Merge "Issue #1966 Feature place holders for the dialogs." into development
Former-commit-id: aec0b1d6fa [formerly 8f2b44a49e] [formerly 6e7ed9e02b] [formerly 6e7ed9e02b [formerly cb156533f4]] [formerly 7245dff8b9 [formerly 6e7ed9e02b [formerly cb156533f4] [formerly 7245dff8b9 [formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]]]
Former-commit-id: 7245dff8b9
Former-commit-id: 89fad9d53da47de6624dd43f363301c83a79a939 [formerly 1e5540cfa0e146921b014d691a8a622f845a82f2] [formerly a551d4b586 [formerly 8b13517100]]
Former-commit-id: a551d4b586
Former-commit-id: 664405e247
|
2013-05-23 09:05:11 -05:00 |
|
Richard Peter
|
3b2b75db42
|
Merge "Issue #1965 Add org.apache.commons.io package to cots." into development
Former-commit-id: 8501c106de [formerly 4dc4b4131d] [formerly 895866b6d9] [formerly 895866b6d9 [formerly df415f7088]] [formerly 041c0ad948 [formerly 895866b6d9 [formerly df415f7088] [formerly 041c0ad948 [formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]]]
Former-commit-id: 041c0ad948
Former-commit-id: f781ef4dd872d1960709d7a78d3a74f24261d7bf [formerly 261ad7af85056f8723367c153d62ac7a260ce0a3] [formerly b28bb05fde [formerly 08f45fe832]]
Former-commit-id: b28bb05fde
Former-commit-id: f43c2d9d61
|
2013-05-23 08:52:47 -05:00 |
|
Roger Ferrel
|
0973e23389
|
Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f
Former-commit-id: 6a801523ee [formerly 7c7f9c01a6] [formerly d7e7a56b84] [formerly d7e7a56b84 [formerly e55f73b4f7]] [formerly d35424df4f [formerly d7e7a56b84 [formerly e55f73b4f7] [formerly d35424df4f [formerly 04684460d021089818509726b1dd23d53fb90440]]]]
Former-commit-id: d35424df4f
Former-commit-id: 055f9d2faa4faecefe04bf7cd4b5c09e527c41e1 [formerly 71942aa83d41336218c476f9a4456699fc337e09] [formerly 760b0f3366 [formerly 2d4434119d]]
Former-commit-id: 760b0f3366
Former-commit-id: 3aa439216d
|
2013-05-23 07:36:15 -05:00 |
|
Bryan Kowal
|
8a06f6e392
|
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: 26e97341e1 [formerly a73d607544] [formerly 73dfc7a5e1] [formerly 73dfc7a5e1 [formerly bfd08efaa9]] [formerly 8061922b70 [formerly 73dfc7a5e1 [formerly bfd08efaa9] [formerly 8061922b70 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]]
Former-commit-id: 8061922b70
Former-commit-id: 4fe6889f8523cb4980a50262344246491e89d77b [formerly 7f883b486090bea47bbfeee228a09574a9b949d0] [formerly 1469cb15d6 [formerly 83c1e3127e]]
Former-commit-id: 1469cb15d6
Former-commit-id: b85da4c89f
|
2013-05-22 22:34:45 -05:00 |
|
Bryan Kowal
|
aea6944fb9
|
Issue #1927 - patch ant includegen task
Former-commit-id: 27ffefe080 [formerly fba4b33fe1] [formerly 575944f70d] [formerly 575944f70d [formerly 40e8f544ea]] [formerly 24c0728db9 [formerly 575944f70d [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]]
Former-commit-id: 24c0728db9
Former-commit-id: 7797aba579139f37ab7c5677fda0bdb301b25a70 [formerly 9b61bbda811981fe5d3e4a80ed88b6107b650443] [formerly e6cfad1759 [formerly 2a17b35e83]]
Former-commit-id: e6cfad1759
Former-commit-id: 0f23a3a390
|
2013-05-22 18:00:43 -05:00 |
|
Nate Jensen
|
ec5e743add
|
Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: f84649d5ab [formerly 516eca979e] [formerly 57e560b745] [formerly 57e560b745 [formerly 4ab1d90d67]] [formerly a6d525ec96 [formerly 57e560b745 [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]]
Former-commit-id: a6d525ec96
Former-commit-id: fbd9094b668f2ffd14f2d9c4d8e20d6c48477394 [formerly b2203d5e824a80b3594b409d049bc1148ae5c2d7] [formerly 5525412779 [formerly 431e97742d]]
Former-commit-id: 5525412779
Former-commit-id: 1aa7bda4f9
|
2013-05-22 16:39:24 -05:00 |
|
Steve Harris
|
ac18c8d860
|
Merge branch 'omaha_13.4.1' into development
Former-commit-id: cecb26acc4 [formerly 511f938c3f] [formerly 570128b986] [formerly 570128b986 [formerly 8496832064]] [formerly 3590310f17 [formerly 570128b986 [formerly 8496832064] [formerly 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]]
Former-commit-id: 3590310f17
Former-commit-id: 53b90733cc691be13f0eeca863265ba5ae7679bb [formerly 186ffe99686bcdd0c279e9784ea72d113f36fb2e] [formerly 389eefd1f9 [formerly 0f9e0b343d]]
Former-commit-id: 389eefd1f9
Former-commit-id: d477564678
|
2013-05-22 16:13:08 -05:00 |
|
Steve Harris
|
c9ac7b1a9c
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 421265c28f [formerly df612396fb] [formerly dce0dc3692] [formerly dce0dc3692 [formerly 097617fa26]] [formerly 462652e31e [formerly dce0dc3692 [formerly 097617fa26] [formerly 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]]
Former-commit-id: 462652e31e
Former-commit-id: 705f305335c977f9534a0f77d5a98c5ab39e4b63 [formerly 19cf9a00ac458922c15640956ecdf8f46546e349] [formerly 026674d0b2 [formerly 299690a202]]
Former-commit-id: 026674d0b2
Former-commit-id: a6bb8b38dd
|
2013-05-22 16:10:04 -05:00 |
|
Steve Harris
|
e2fda9382b
|
13.4.1-12 baseline
Former-commit-id: 6bf996603a [formerly 623f813923] [formerly 397bbf674a] [formerly 397bbf674a [formerly 6a97b4325a]] [formerly e53ada66b8 [formerly 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: 6070ab6d094da85dee3c94ac52af59055eba01a9 [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b] [formerly b745b332ae [formerly bd4f93e859]]
Former-commit-id: b745b332ae
Former-commit-id: fb41995981
|
2013-05-22 16:42:39 -04:00 |
|
Benjamin Phillippe
|
e08c5662d4
|
Issue #2022 Removed data delivery project from feature
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd
Former-commit-id: 99e15a39d5 [formerly feeb6126bb] [formerly 0308f217d6] [formerly 0308f217d6 [formerly 4d1252523e]] [formerly 3e9fe9892e [formerly 0308f217d6 [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]]]
Former-commit-id: 3e9fe9892e
Former-commit-id: 41e269ec4b75f90d911b9e82c1993e1663b8147b [formerly fa6325803c190e9467895d087ac2f99cbe7f7004] [formerly 8cae1b56f1 [formerly ce20ead9e7]]
Former-commit-id: 8cae1b56f1
Former-commit-id: 09126056a6
|
2013-05-22 12:49:46 -05:00 |
|
David Gillingham
|
e426037c09
|
Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: b992dda693 [formerly 511098fffd] [formerly 2555cf9819] [formerly fc3c7eb9fbf37bb7d9daf99d556d79bdf45aeb63 [formerly 2555cf9819 [formerly 5cba0f5e40]]] [formerly 801c659108 [formerly 2555cf9819 [formerly 5cba0f5e40] [formerly 801c659108 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]]
Former-commit-id: 801c659108
Former-commit-id: 18c8ef624337cc48dafc64b8d4831c73ee8807ba [formerly 7464c78970ff1efe18387d6d2105db0eb2e2d4ad] [formerly 1471a7fa34 [formerly 60aeb71652]]
Former-commit-id: 1471a7fa34
Former-commit-id: 60850d6f8a
|
2013-05-22 11:42:08 -05:00 |
|
Benjamin Phillippe
|
05c3324000
|
Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: 3aabf0555b [formerly aab1aa57d4] [formerly 7a908bbeaf] [formerly 7a908bbeaf [formerly b9f2bde20e]] [formerly c3a376475b [formerly 7a908bbeaf [formerly b9f2bde20e] [formerly c3a376475b [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]]]
Former-commit-id: c3a376475b
Former-commit-id: d8b4b364d0158bce6f59949bd1101ad88e2c7ae1 [formerly 97b5016d0f29b44e02a2e20c7079fd9348e0adf5] [formerly 1c50a8b9d3 [formerly ad039bae0c]]
Former-commit-id: 1c50a8b9d3
Former-commit-id: 99ed99e6d3
|
2013-05-22 11:38:42 -05:00 |
|
Brad Gonzales
|
629a1184b9
|
Issue #1965 Add org.apache.commons.io package to cots.
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed
Former-commit-id: b223466511 [formerly 819160fcde] [formerly 33045d73a6] [formerly 33045d73a6 [formerly 4bc98160ab]] [formerly 598a7a221e [formerly 33045d73a6 [formerly 4bc98160ab] [formerly 598a7a221e [formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]]]
Former-commit-id: 598a7a221e
Former-commit-id: 3becd05a6644fc2065c3eb64bebb0e99e03cf5c5 [formerly ca35c74668d7cc1c2b516ca39d37aeba84ced527] [formerly 6d483764e3 [formerly 858f68fc5c]]
Former-commit-id: 6d483764e3
Former-commit-id: 6811365078
|
2013-05-21 16:29:01 -05:00 |
|
Richard Peter
|
1de5a67b0a
|
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: e35eda0aa5 [formerly 8fac7f2fd9] [formerly 62c8176486] [formerly 62c8176486 [formerly c9c1570960]] [formerly b4344d3c04 [formerly 62c8176486 [formerly c9c1570960] [formerly b4344d3c04 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]]
Former-commit-id: b4344d3c04
Former-commit-id: b7b4a1778b7fd93af5931068c5c3cc3e327854fd [formerly 8928a3d0297f1d5a036e9cf68ec32e5d793580ad] [formerly 1bbddf8fdf [formerly 489fdf49b1]]
Former-commit-id: 1bbddf8fdf
Former-commit-id: b3c32889b1
|
2013-05-21 13:07:51 -05:00 |
|
Greg Armendariz
|
28eec6d047
|
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
Former-commit-id: ec2e3e3e1a [formerly da4e717772] [formerly fce1512b37] [formerly fce1512b37 [formerly 20a9ad95e5]] [formerly eecbf2718a [formerly fce1512b37 [formerly 20a9ad95e5] [formerly eecbf2718a [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]]]
Former-commit-id: eecbf2718a
Former-commit-id: 7883cc079a9a1a7095cc287e3b6655739008e3e0 [formerly faf103cebb41e879d86ec60b59e142420585d7d2] [formerly cd96d6d2e6 [formerly 525cd5c751]]
Former-commit-id: cd96d6d2e6
Former-commit-id: bb67a4fe0a
|
2013-05-21 12:24:19 -05:00 |
|
Richard Peter
|
3648f79de0
|
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: 1f30babd12 [formerly efd545925e] [formerly 3d84e1dd53] [formerly 3d84e1dd53 [formerly 8aa4b0025c]] [formerly 930ff50fb8 [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]]
Former-commit-id: 930ff50fb8
Former-commit-id: d291172637ec4de74f5d012b0eff10f06216419d [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f] [formerly 76f11f00ae [formerly 81ae3ea8bf]]
Former-commit-id: 76f11f00ae
Former-commit-id: ffe0b35085
|
2013-05-21 12:11:21 -05:00 |
|
Bryan Kowal
|
91d7a6ea9e
|
Issue #1952 - remove duplicate filesystem hierarchy
Former-commit-id: 6ed633934d [formerly b14dd898ac] [formerly e9abe7185b] [formerly e9abe7185b [formerly 4b8868ca54]] [formerly 7027f97e2a [formerly e9abe7185b [formerly 4b8868ca54] [formerly 7027f97e2a [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]]]
Former-commit-id: 7027f97e2a
Former-commit-id: 2909a438b6d372664e648d5430d72be907e40705 [formerly 82aa40c3c40fcbbba4f5844ff450074ef0571e57] [formerly 61a613b490 [formerly 62d21498a6]]
Former-commit-id: 61a613b490
Former-commit-id: 1d462b582b
|
2013-05-21 11:09:57 -05:00 |
|
Nate Jensen
|
d32774f874
|
Merge "Issue #2001 fix message handling" into development
Former-commit-id: e487485c19 [formerly 2bf84e9044] [formerly 8438eb1b4a] [formerly 8438eb1b4a [formerly 737b265c34]] [formerly 4d519da3a9 [formerly 8438eb1b4a [formerly 737b265c34] [formerly 4d519da3a9 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]]]]
Former-commit-id: 4d519da3a9
Former-commit-id: 4bb7b9f12790047757fe793d748b2aec7f6160ba [formerly 23644d491fafa6221b12115945c203db822dd9d5] [formerly 0fc260728b [formerly d2cccd342b]]
Former-commit-id: 0fc260728b
Former-commit-id: e464b37ce3
|
2013-05-21 11:00:32 -05:00 |
|
Richard Peter
|
99fbec36cd
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: f7905ff763 [formerly c40709229f] [formerly 4809b3c15b] [formerly 4809b3c15b [formerly 73372622f7]] [formerly 77a08ebd31 [formerly 4809b3c15b [formerly 73372622f7] [formerly 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 0f937c2b19c19923735a81124cb81aeabd3418dc [formerly 38741ab6e09457ab781a256b369b5b60e307fc09] [formerly 21b87e9ea7 [formerly 427f54a878]]
Former-commit-id: 21b87e9ea7
Former-commit-id: 8e252f89f0
|
2013-05-21 10:35:00 -05:00 |
|
Nate Jensen
|
05ba71f22f
|
Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b
Former-commit-id: a2681fe7bd [formerly deea93d7e7] [formerly 56309efafe] [formerly 56309efafe [formerly 1ab118958f]] [formerly 960bc6db69 [formerly 56309efafe [formerly 1ab118958f] [formerly 960bc6db69 [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]]
Former-commit-id: 960bc6db69
Former-commit-id: 082b4a7c94b4db045065209485221cdea8de8a1c [formerly c70110d442b8e122c8572c0d2850cbac6c42bc1a] [formerly a06bb176ba [formerly e575c19ab6]]
Former-commit-id: a06bb176ba
Former-commit-id: 22d9440b6a
|
2013-05-21 10:26:18 -05:00 |
|
Nate Jensen
|
5a14a46f1b
|
Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
Former-commit-id: 865090aaae [formerly 8e7905197a] [formerly 18e6f84418] [formerly 18e6f84418 [formerly f16606cfba]] [formerly d02ce9d389 [formerly 18e6f84418 [formerly f16606cfba] [formerly d02ce9d389 [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]]]
Former-commit-id: d02ce9d389
Former-commit-id: c09bd38e9df0258f934fb7f50b658cf978802837 [formerly 8f11dd9f2fd571f626dc03f0b07328cca234dcf7] [formerly 51a31a08ca [formerly 80b1a9d18c]]
Former-commit-id: 51a31a08ca
Former-commit-id: 1c581fd607
|
2013-05-21 10:22:24 -05:00 |
|
Dustin Johnson
|
da22cd506f
|
Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 6d89afef68 [formerly 150ae88eba] [formerly fef73ac960] [formerly fef73ac960 [formerly 195cd5f210]] [formerly 8fcc958d84 [formerly fef73ac960 [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]]
Former-commit-id: 8fcc958d84
Former-commit-id: 707a6447cc8691878d1927f2e8ad1e1470013534 [formerly 5235790c12e2dc92a8f2ee23097bc55d4324c17f] [formerly bd65447c9f [formerly 5695c4f967]]
Former-commit-id: bd65447c9f
Former-commit-id: bf3f162fc9
|
2013-05-21 08:19:34 -05:00 |
|
Steve Harris
|
ef53f9db43
|
13.4.1-11 baseline
Former-commit-id: 21425a8cf8 [formerly 65d8f51034] [formerly d6319a2ca6] [formerly d6319a2ca6 [formerly 2edee36158]] [formerly c0376ce9ed [formerly d6319a2ca6 [formerly 2edee36158] [formerly c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]]
Former-commit-id: c0376ce9ed
Former-commit-id: c9c9330a44bd293501f9679a596c7954789663a6 [formerly d3627734c45f2b66baada7042aad74b4dccee3dc] [formerly 4d88863515 [formerly 6df093ef48]]
Former-commit-id: 4d88863515
Former-commit-id: 5db95cce55
|
2013-05-21 09:19:25 -04:00 |
|
Ben Steffensmeier
|
3e18403e62
|
Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9
Former-commit-id: bcfdd143ec [formerly 5219bd8426] [formerly c11631c7da] [formerly c11631c7da [formerly 1a31aa2211]] [formerly 931e76ae59 [formerly c11631c7da [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]]
Former-commit-id: 931e76ae59
Former-commit-id: 591298cce148a54b30402cce8c95c38e2ddf91ed [formerly b4adabb2d10268100118534040b4fed536be1378] [formerly 30eb486e45 [formerly 5147eb18d4]]
Former-commit-id: 30eb486e45
Former-commit-id: bd89419f5e
|
2013-05-20 18:00:32 -05:00 |
|
Richard Peter
|
35febc4d43
|
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: ee352a5e7b [formerly c699240a1b] [formerly 8b2ecd5771] [formerly 8b2ecd5771 [formerly e0740990ce]] [formerly 59c38fdb78 [formerly 8b2ecd5771 [formerly e0740990ce] [formerly 59c38fdb78 [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]]
Former-commit-id: 59c38fdb78
Former-commit-id: b95eacc7c3b2ec1a29564b1ce62ee71ae6fe882a [formerly 36148f00d4aad37c667d7244e309f001bd6335f8] [formerly 72206676ee [formerly 8b7cf1beb8]]
Former-commit-id: 72206676ee
Former-commit-id: 5efe58df0b
|
2013-05-20 17:49:22 -05:00 |
|
Roger Ferrel
|
d6c20360e1
|
Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac
Former-commit-id: eb954e0f07 [formerly 0b4fb8d04c] [formerly e3c06b643b] [formerly e3c06b643b [formerly 16c7de874a]] [formerly dfd586fca6 [formerly e3c06b643b [formerly 16c7de874a] [formerly dfd586fca6 [formerly 57a43dfefb79d49895beace44930db630cd502be]]]]
Former-commit-id: dfd586fca6
Former-commit-id: f981a0dc963dbe2e237dfd0fc2ddfe74e6188b19 [formerly 4c43796fabb9d77c96bd1af9250c9c7f64374a79] [formerly 4a5073902f [formerly c9e6e367fe]]
Former-commit-id: 4a5073902f
Former-commit-id: 0db7741ce5
|
2013-05-20 17:43:47 -05:00 |
|