Commit graph

3256 commits

Author SHA1 Message Date
Lee Venable
15eb82362e Merge "Issue #2076 - fix hydro TS control dialog station list selection and graph button enabling" into development
Former-commit-id: dcf9ace09a [formerly 2a557e1e3f] [formerly dcf9ace09a [formerly 2a557e1e3f] [formerly 6323016fba [formerly c46e0e59906ad6a0d29b748a79e074c5718b2ab3]]]
Former-commit-id: 6323016fba
Former-commit-id: 5b1cbebec0 [formerly 08f67bf954]
Former-commit-id: a1e813536d
2013-06-06 17:24:29 -05:00
Mike Duff
089bfef8ed Issue #2076 - fix hydro TS control dialog station list selection and graph button enabling
Change-Id: I4e53b03fe12453dd8c78231c20fba6889833db9e

Former-commit-id: 632e7e9ba1 [formerly 7e9c529c60] [formerly 632e7e9ba1 [formerly 7e9c529c60] [formerly 9a4f0e8679 [formerly ae2c0314eef5998aabcf9323ef33de7cdf378a7f]]]
Former-commit-id: 9a4f0e8679
Former-commit-id: ca96e8fd1e [formerly 779cc0f765]
Former-commit-id: 3bf6be1299
2013-06-06 17:14:34 -05:00
Greg Armendariz
0bf01b9b09 Merge "Issue #1927 - remove obsolete files" into development
Former-commit-id: e220ed1ae4 [formerly 367d9850b3] [formerly e220ed1ae4 [formerly 367d9850b3] [formerly afed5f12a0 [formerly e19a1da294b9d0e34c126537a13a12e8aba8f35f]]]
Former-commit-id: afed5f12a0
Former-commit-id: e9aea7130e [formerly 61d6d42121]
Former-commit-id: 3c25f8969d
2013-06-06 16:49:05 -05:00
Nate Jensen
64983bb91d Merge "Issue #2023: Pure python client implementation of Data Access Framework." into development
Former-commit-id: 4c9e7eb885 [formerly cc7f3d9cf6] [formerly 4c9e7eb885 [formerly cc7f3d9cf6] [formerly 78b33b57d1 [formerly f5cc02c442077789e19bf615ec15a7b2e4195721]]]
Former-commit-id: 78b33b57d1
Former-commit-id: 9ee84c0d97 [formerly 479a15ab85]
Former-commit-id: 465f0640d4
2013-06-06 16:42:00 -05:00
Bryan Kowal
6e1273ed38 Issue #1927 - remove obsolete files
Former-commit-id: 6aecf2370f [formerly 6d642232dd] [formerly 6aecf2370f [formerly 6d642232dd] [formerly 4962310360 [formerly 00f7ba0212f84db3b36805e2dcc2790d67fcfaac]]]
Former-commit-id: 4962310360
Former-commit-id: fa1add535d [formerly fee1818521]
Former-commit-id: 1f320ec6b4
2013-06-06 16:35:04 -05:00
Steve Harris
18fdb31920 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: 64cf1aedb1 [formerly 571757b2a6] [formerly 64cf1aedb1 [formerly 571757b2a6] [formerly 2327205cb7 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: 8b78f538d3 [formerly 035d74b348]
Former-commit-id: abfd0b9ead
2013-06-06 15:46:23 -05:00
Steve Harris
7d8ae66ddf Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: b0c0e2e7cf [formerly 1e4c538e58] [formerly b0c0e2e7cf [formerly 1e4c538e58] [formerly 56e04554e9 [formerly 2e1e30df32ef00523dbcd995457b854cbcad3d41]]]
Former-commit-id: 56e04554e9
Former-commit-id: 1d4e65d435 [formerly 72a559120f]
Former-commit-id: 4b06eb1152
2013-06-06 15:43:34 -05:00
Greg Armendariz
ac4e63f414 Merge "Issue #2021 - do not track changes in directories generated by the build for tmcp; equivalent to ignoring the java bin directories and class files." into development
Former-commit-id: 3cd438be84 [formerly bcddd2e3b4] [formerly 3cd438be84 [formerly bcddd2e3b4] [formerly 9ab12d70df [formerly 958b1c701e94f6f16e7479573491c8de16d9d8d3]]]
Former-commit-id: 9ab12d70df
Former-commit-id: 8c140407ae [formerly 6eb29b4a65]
Former-commit-id: f8e5c40e03
2013-06-06 15:25:16 -05:00
Bryan Kowal
1499eb7ecb Issue #1927 - build.properties standardization.
Former-commit-id: 5d5b26a543 [formerly 0268fa48b0] [formerly 5d5b26a543 [formerly 0268fa48b0] [formerly a0e08f5bf7 [formerly 6cc5a2bee443221c9585bbe75a2e87328088e340]]]
Former-commit-id: a0e08f5bf7
Former-commit-id: 4e1d503b5e [formerly 6fff973f2d]
Former-commit-id: d773e6762b
2013-06-06 14:35:17 -05:00
Steve Harris
d46b0413fb 13.4.1-14 baseline
Former-commit-id: be236eb722 [formerly c749e122eb] [formerly be236eb722 [formerly c749e122eb] [formerly 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: cebc1ddb63 [formerly dee685e3c7]
Former-commit-id: 8ec7524cbb
2013-06-06 15:15:27 -04:00
Nate Jensen
cb59f0f3b2 Merge "Issue #2072 Fix concurrency problems when init is called before time matching is done." into development
Former-commit-id: 17f0a8426b [formerly b9464b7adf] [formerly 17f0a8426b [formerly b9464b7adf] [formerly c6c999b17e [formerly 88606cb2aef6e92e39ca5947c28784f5bc5b919c]]]
Former-commit-id: c6c999b17e
Former-commit-id: d97cf61de1 [formerly 4b9424bee3]
Former-commit-id: 1dedd423b2
2013-06-06 14:13:09 -05:00
Nate Jensen
aeb1d5da07 Merge "Issue #2068 Unpack viz cots plugins." into development
Former-commit-id: 58cc50e6f8 [formerly 050f48c204] [formerly 58cc50e6f8 [formerly 050f48c204] [formerly 65af14d99c [formerly 4a60beb7ab6d44d30fd9d4c9c7486a95d5581cb2]]]
Former-commit-id: 65af14d99c
Former-commit-id: 5ff4dafed0 [formerly 248ce85b36]
Former-commit-id: 52c499d544
2013-06-06 14:11:53 -05:00
Nate Jensen
61dd2067a7 Merge "Issue #2041 fix python job coordinator shutdown." into development
Former-commit-id: bcc8fcd81e [formerly 333af91ca3] [formerly bcc8fcd81e [formerly 333af91ca3] [formerly 855c2a4b58 [formerly 4d6418c7f32cdbd78fe52edc6f9e2784aeffd4e8]]]
Former-commit-id: 855c2a4b58
Former-commit-id: 26dd286c55 [formerly ea1e5f4cb1]
Former-commit-id: b778a34bda
2013-06-06 14:11:34 -05:00
Lee Venable
5f11afd978 Merge "Issue #2071 - refactor data delivery help dialogs" into development
Former-commit-id: a18a364f8e [formerly 791f9e93aa] [formerly a18a364f8e [formerly 791f9e93aa] [formerly ac6df52b0d [formerly 14f9efda965a700d9e701e36a3ff2e56d78b1dba]]]
Former-commit-id: ac6df52b0d
Former-commit-id: bc92d23e99 [formerly a034c677d1]
Former-commit-id: fa9c7e1bdb
2013-06-06 14:06:53 -05:00
David Gillingham
a8c3259817 Issue #2023: Pure python client implementation of Data Access Framework.
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427

Former-commit-id: 2c0af328b6 [formerly ae3e7a64b0] [formerly 2c0af328b6 [formerly ae3e7a64b0] [formerly 4bdf7178bd [formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]]]
Former-commit-id: 4bdf7178bd
Former-commit-id: 242d3a5493 [formerly 3f4b44fbbc]
Former-commit-id: 402b6c4f86
2013-06-06 13:47:31 -05:00
Ben Steffensmeier
74fb3d5a47 Issue #2072 Fix concurrency problems when init is called before time matching is done.
Former-commit-id: 14750f4724 [formerly 0ed736513c] [formerly 14750f4724 [formerly 0ed736513c] [formerly 0842b9d292 [formerly 79bec984b094fc84bfb9da3e5c20796844e9bbbf]]]
Former-commit-id: 0842b9d292
Former-commit-id: b6c9b3d2c6 [formerly 6b1a7700dd]
Former-commit-id: 1c8a3b9cb1
2013-06-06 13:23:29 -05:00
Ben Steffensmeier
c30e3bd615 Issue #2068 Unpack viz cots plugins.
Former-commit-id: 62c3bc9bbe [formerly a1a44cdc7a] [formerly 62c3bc9bbe [formerly a1a44cdc7a] [formerly 073ad47a7d [formerly 5a76cddc79705708969b37de530ad0bce2c26505]]]
Former-commit-id: 073ad47a7d
Former-commit-id: b117268b67 [formerly 7f9cf6d46d]
Former-commit-id: 486ea54d69
2013-06-06 13:17:50 -05:00
Ben Steffensmeier
2df9ca7847 Issue #2041 fix python job coordinator shutdown.
Former-commit-id: 955468866e [formerly 4bf7b44234] [formerly 955468866e [formerly 4bf7b44234] [formerly ab0bb800cb [formerly c749e5f77e06ede7fa39ece6846d957b8edfaed2]]]
Former-commit-id: ab0bb800cb
Former-commit-id: b8cef5b733 [formerly 8111840673]
Former-commit-id: 30df5cc2e4
2013-06-06 13:13:02 -05:00
Mike Duff
ad9f567037 Issue #2071 - refactor data delivery help dialogs
Change-Id: I4820f1847e0228f0fcd6166b8dd13e289623a3a0

Former-commit-id: d218159b3b [formerly e579626dea] [formerly d218159b3b [formerly e579626dea] [formerly 22132fbef8 [formerly 7734c4d8ef387c47f32930541a5fc5c09f3261fe]]]
Former-commit-id: 22132fbef8
Former-commit-id: f507b7afab [formerly c37e75e0f7]
Former-commit-id: 545c7c80f4
2013-06-06 12:33:45 -05:00
Roger Ferrel
79d8cc2c75 Issue #1966 Working case generation without compression. Changes to Retention to remove compile errors.
Change-Id: I6ecfe7d9a4b352318b718849ba7e62b24254385d

Former-commit-id: 147a321455 [formerly b645cd6079] [formerly 147a321455 [formerly b645cd6079] [formerly 0737075420 [formerly 43a4ee08b063e1e2aba5035b964cf0b93462885b]]]
Former-commit-id: 0737075420
Former-commit-id: f5756aa417 [formerly 47b72d3a5a]
Former-commit-id: 51af7208a1
2013-06-06 12:27:38 -05:00
Lee Venable
85a068fab9 Issue #2065 Added code to alert user to use the clear button to close SCAN dialogs
Change-Id: I9668a953f76a4dfa1ff4fb61ff6b15e21f77d755

Former-commit-id: 6b6d351996 [formerly 2099f63370] [formerly 6b6d351996 [formerly 2099f63370] [formerly ef425c9807 [formerly 399a031eeb9e3eeabf60533cae11df7062446797]]]
Former-commit-id: ef425c9807
Former-commit-id: cece058287 [formerly 08b70b3bcb]
Former-commit-id: 3a11e51ff9
2013-06-06 12:04:33 -05:00
Nate Jensen
a13437abed Merge "Issue #2069 populate the procedures list dialog asynchronously" into development
Former-commit-id: ea9c792e1f [formerly 4d87b2fbc7] [formerly ea9c792e1f [formerly 4d87b2fbc7] [formerly 0d1b039ca5 [formerly caecc0c54e223f87294a8a49d824576dbf9899e2]]]
Former-commit-id: 0d1b039ca5
Former-commit-id: b056cb499d [formerly 553e2412ca]
Former-commit-id: 5090880514
2013-06-06 10:40:21 -05:00
Nate Jensen
6ba5304a08 Merge "Issue #1638 Moved python localization project out of common.base feature to keep it minimal." into development
Former-commit-id: 3db4c65c00 [formerly da536f4e31] [formerly 3db4c65c00 [formerly da536f4e31] [formerly a389d8541e [formerly 838f9848e888c852af567dc5a21009038f324348]]]
Former-commit-id: a389d8541e
Former-commit-id: a84a66fd6d [formerly b1dbc661c9]
Former-commit-id: d8b5589091
2013-06-06 09:54:20 -05:00
Matt Nash
fece314774 Issue #2069 populate the procedures list dialog asynchronously
Change-Id: I770f87a9de4d73084ca8c022038597405e594766

Former-commit-id: a8b39e28c1 [formerly 5c21ce0644] [formerly a8b39e28c1 [formerly 5c21ce0644] [formerly 3b442729e4 [formerly fe4d566519ff114d739777e0663d01b903a2c4ae]]]
Former-commit-id: 3b442729e4
Former-commit-id: fed71d1d30 [formerly f87969c8cf]
Former-commit-id: 30e32c167d
2013-06-06 09:44:46 -05:00
Richard Peter
e573be4d48 Merge "Issue #2041 Switch derived parameters to use concurrent python for threading. Change-Id: I791eb2f4803b5d29928dd153bbcf157ae643534f" into development
Former-commit-id: 7b5ff91bae [formerly f30c0f93ed] [formerly 7b5ff91bae [formerly f30c0f93ed] [formerly 24d7cbdf6c [formerly a82fb1b8dc3940c3a59c289ead9bdff3cefbd82a]]]
Former-commit-id: 24d7cbdf6c
Former-commit-id: b5f0306900 [formerly 9a23ebef30]
Former-commit-id: 865cb2da29
2013-06-06 09:43:22 -05:00
Richard Peter
bc8fc20abb Merge "Issue #2041 Improve exception handing in grid resources. Change-Id: I9edcb10da3ec9bfce16650cbf8c480af94dc6d39" into development
Former-commit-id: dd7bfffe1c [formerly 6f277bd0b8] [formerly dd7bfffe1c [formerly 6f277bd0b8] [formerly 93c936373e [formerly 07c9ee624f8e9271cd4d8ab53d4409a26378622f]]]
Former-commit-id: 93c936373e
Former-commit-id: 54dd8ec956 [formerly e3540e0330]
Former-commit-id: 67122a3c05
2013-06-06 09:42:03 -05:00
Max Schenkelberg
fd9ab77cc6 Issue #1638 Moved python localization project out of common.base feature to keep it minimal.
Amend: Added to wrong edex feature

Change-Id: Ic1f3bf92a4559ba04eb6a05c39d5773393235330

Former-commit-id: 6afefe027b [formerly 0bfeed7240] [formerly 6afefe027b [formerly 0bfeed7240] [formerly 424ea84d6e [formerly ac578db9a9809798c30d2c694bedb1d960395e77]]]
Former-commit-id: 424ea84d6e
Former-commit-id: 1872fd5b67 [formerly e80b104e15]
Former-commit-id: 6570c3042b
2013-06-05 17:13:43 -05:00
David Gillingham
ce5c51d360 Issue #2063: Improve performance of grid blanking in iscMosaic by only retrieving history data, not entire grid slices.
Change-Id: Icd25e7e54a391ca19445be866e411b35aed54b16

Former-commit-id: 51b317ac52 [formerly 9acf385f21] [formerly 51b317ac52 [formerly 9acf385f21] [formerly bad6a1fa40 [formerly 5570ee749c5797f8f2c9ab3f6f8392d2c5680d32]]]
Former-commit-id: bad6a1fa40
Former-commit-id: 5fe4739fc4 [formerly 070365714a]
Former-commit-id: 8199019e54
2013-06-05 16:26:04 -05:00
Ben Steffensmeier
e8d46644a1 Issue #2041 Switch derived parameters to use concurrent python for threading.
Change-Id: I791eb2f4803b5d29928dd153bbcf157ae643534f

Former-commit-id: e73e50e8a8 [formerly 56f9b88ad5] [formerly e73e50e8a8 [formerly 56f9b88ad5] [formerly 76e4882b7c [formerly 11f346d4d7baae08f61966a91e4d5f579630c7de]]]
Former-commit-id: 76e4882b7c
Former-commit-id: a1d0a7da5a [formerly 7c0c8b02d8]
Former-commit-id: eda82d0197
2013-06-05 13:34:26 -05:00
Nate Jensen
ffddb246c1 Merge "Issue #1869 Ensure RecordFactory throws NoPluginException when there is no plugin." into development
Former-commit-id: 9d27d25a0b [formerly dc2a278ab5] [formerly 9d27d25a0b [formerly dc2a278ab5] [formerly 0f7bf4dd6a [formerly 38aa364a89d87896c2569026bc7e16a71babd308]]]
Former-commit-id: 0f7bf4dd6a
Former-commit-id: 9ef714d7a3 [formerly 5f91361d7c]
Former-commit-id: 417abbb4fc
2013-06-05 13:26:12 -05:00
Dustin Johnson
6af9819687 Merge "Issue #2064 - Add ability to subscribe to observational point data (MADIS)" into development
Former-commit-id: 6d589a3c79 [formerly 37791e95a1] [formerly 6d589a3c79 [formerly 37791e95a1] [formerly 022346b4b3 [formerly 0fe4193763117516c900f4a0236706fd1b08a781]]]
Former-commit-id: 022346b4b3
Former-commit-id: 4722edba19 [formerly 3554d85245]
Former-commit-id: 0b6ee64ce5
2013-06-05 13:24:54 -05:00
Richard Peter
8560a240ab Merge "Issue #2043 Fix Cape.py python imports." into development
Former-commit-id: a6c207c2b8 [formerly ae1cde51ac] [formerly a6c207c2b8 [formerly ae1cde51ac] [formerly ef2332ee1b [formerly 04399075a1c5a8204b77b374f0d7ae70594c89a4]]]
Former-commit-id: ef2332ee1b
Former-commit-id: 24c47260f7 [formerly 23ae300a3b]
Former-commit-id: 49c77b336e
2013-06-05 12:24:41 -05:00
Mike Duff
be7b0be127 Issue #2064 - Add ability to subscribe to observational point data (MADIS)
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa

Former-commit-id: 77611d7e9c [formerly 321209adb8] [formerly 77611d7e9c [formerly 321209adb8] [formerly 12e5155edc [formerly 9142ab024fb870b6c9fa18d42d42ae869c4ec58c]]]
Former-commit-id: 12e5155edc
Former-commit-id: 41f817e755 [formerly 5e7ec92696]
Former-commit-id: 98d413f51b
2013-06-05 12:06:58 -05:00
Ron Anderson
764f1dbec6 Issue #2026 Improved alertviz error logging
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8

Former-commit-id: 6bab5a5935 [formerly 39e6673685] [formerly 6bab5a5935 [formerly 39e6673685] [formerly 859b72a714 [formerly d2418d309830a5063fcd90fd18a8d636574ddfbb]]]
Former-commit-id: 859b72a714
Former-commit-id: b3f48138a0 [formerly 94cfb2dddf]
Former-commit-id: c0efa5b28f
2013-06-05 12:05:15 -05:00
Ben Steffensmeier
1defdbc53b Issue #2043 Fix Cape.py python imports.
Former-commit-id: 33cedf88d9 [formerly afebe38b8b] [formerly 33cedf88d9 [formerly afebe38b8b] [formerly bf7a64d328 [formerly 9744c8883de4f3f739e517219f207ab850292c0f]]]
Former-commit-id: bf7a64d328
Former-commit-id: 9cad47b52f [formerly c49a80a04b]
Former-commit-id: 6c2e4fd402
2013-06-05 12:04:23 -05:00
Richard Peter
b5a6bb343f Merge "Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to." into development
Former-commit-id: adfc741329 [formerly 27442499e6] [formerly adfc741329 [formerly 27442499e6] [formerly e8c77bb251 [formerly 5eb49ca9bf6a263af5059531b09cdb8a735ba9ac]]]
Former-commit-id: e8c77bb251
Former-commit-id: 33b799fb50 [formerly 42777a98a8]
Former-commit-id: e130b14500
2013-06-05 11:48:09 -05:00
Ben Steffensmeier
35a7d1eb33 Issue #1869 Ensure RecordFactory throws NoPluginException when there is no plugin.
Former-commit-id: 5bb01374b9 [formerly 772ecd6e46] [formerly 5bb01374b9 [formerly 772ecd6e46] [formerly 58b51b725c [formerly 50da6ea32b6d876d70d8c4d7a4914f5bb17b4c62]]]
Former-commit-id: 58b51b725c
Former-commit-id: b65f1d4da0 [formerly 414b679b0a]
Former-commit-id: 637c55af33
2013-06-05 10:17:20 -05:00
Lee Venable
d4d3655726 Merge "Issue #1984 - Save images for table columns so they don't throw errors in Windows." into development
Former-commit-id: 3c2ba8d3ec [formerly 778baf331f] [formerly 3c2ba8d3ec [formerly 778baf331f] [formerly 6d0d8a3a8e [formerly a2fc3646e554018740153c78f2ecd3bc88abb691]]]
Former-commit-id: 6d0d8a3a8e
Former-commit-id: 04788b06d9 [formerly a0cd3823a3]
Former-commit-id: 48a57ac567
2013-06-05 08:45:39 -05:00
Nate Jensen
e61ae7a5e1 Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
Former-commit-id: 38b028b665 [formerly 725adab244] [formerly 38b028b665 [formerly 725adab244] [formerly 4bfba7d6c6 [formerly 3d70e1866b618991ed0f8decb4925c794222c7ad]]]
Former-commit-id: 4bfba7d6c6
Former-commit-id: 64ccc2c283 [formerly 07b1854308]
Former-commit-id: 27a4a99771
2013-06-05 08:42:23 -05:00
Bryan Kowal
a4cf78cd95 Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
Former-commit-id: 3427534c29 [formerly 4b5c653363] [formerly 3427534c29 [formerly 4b5c653363] [formerly 2abb257d35 [formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]]]
Former-commit-id: 2abb257d35
Former-commit-id: b3b85069ea [formerly 98150aa493]
Former-commit-id: 4f871084ec
2013-06-04 18:25:58 -05:00
Ben Steffensmeier
6e18c7a6a8 Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
Former-commit-id: a01c4eb02b [formerly 2dc2e990cb] [formerly a01c4eb02b [formerly 2dc2e990cb] [formerly 19af45e525 [formerly 327fe058b08967d18fa83ac9e6fc9c3356d68ff2]]]
Former-commit-id: 19af45e525
Former-commit-id: 016ed7211f [formerly d773bbf625]
Former-commit-id: d9b9d4ed7c
2013-06-04 18:23:06 -05:00
Ben Steffensmeier
4fab8e711d Issue #2041 Improve exception handing in grid resources.
Change-Id: I9edcb10da3ec9bfce16650cbf8c480af94dc6d39

Former-commit-id: 956fd6e846 [formerly 5951b85ac6] [formerly 956fd6e846 [formerly 5951b85ac6] [formerly 7259fdc3a8 [formerly 17334720cd9f5705687b2030b1532b342e9a6fb8]]]
Former-commit-id: 7259fdc3a8
Former-commit-id: d79c15be5a [formerly 8b3df5140c]
Former-commit-id: 70fbbeb457
2013-06-04 17:38:56 -05:00
Ben Steffensmeier
580302942a Issue #2041 Improve exception handling for concurrent python.
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47

Former-commit-id: 5d5cd5e5f4 [formerly 8ce74c44df] [formerly 5d5cd5e5f4 [formerly 8ce74c44df] [formerly ef10b56e2b [formerly c605b0ce9b7437bfaa803b31c6f4b2f7dc17a6ea]]]
Former-commit-id: ef10b56e2b
Former-commit-id: f78e0f18bf [formerly 0f70964bc9]
Former-commit-id: 6109fde71d
2013-06-04 17:03:05 -05:00
Bryan Kowal
7bf9b0da2c Issue #2021 - do not track changes in directories generated by the build for tmcp; equivalent to ignoring the java bin directories and class files.
Change-Id: I72461155481aec1661ebb80a6230aeed1cb00dfb

Former-commit-id: ad2099d3e4 [formerly a77c77e7bc] [formerly ad2099d3e4 [formerly a77c77e7bc] [formerly ca9275ad16 [formerly 291ae689ebe66d24a9b0154180f9114a6486aa20]]]
Former-commit-id: ca9275ad16
Former-commit-id: 942e904172 [formerly 4d2abf761b]
Former-commit-id: c2737a8a6f
2013-06-04 15:49:58 -05:00
Lee Venable
253da4cf92 Issue #1984 - Save images for table columns so they don't throw errors in Windows.
Change-Id: I42bb4549664296abde66d5904b0ce1739ba6232c

Former-commit-id: 86ff9a13a8 [formerly 187a4e9b17] [formerly 86ff9a13a8 [formerly 187a4e9b17] [formerly 377c675436 [formerly 3f26818dfeb006393598af41faf33cac6957d3e0]]]
Former-commit-id: 377c675436
Former-commit-id: e809c6dfaf [formerly d6274ac813]
Former-commit-id: 3759a4a914
2013-06-04 15:48:40 -05:00
Greg Armendariz
7b8c0cd36c Merge "Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files" into development
Former-commit-id: 38e765397a [formerly 2bb9f1ceec] [formerly 38e765397a [formerly 2bb9f1ceec] [formerly 5b29c71d38 [formerly b88ac881c4963543a21566ae1361638ec40f8ac0]]]
Former-commit-id: 5b29c71d38
Former-commit-id: 38c7865a12 [formerly 9af992ed12]
Former-commit-id: 61594d9524
2013-06-04 15:29:10 -05:00
Richard Peter
1aa877a259 Merge "Issue #1965 Initial archive retention dialog work. updated archive creation, purge, and test cases after Roger's last checkin. added edex plugin for feature. added an abstract base archive dialog." into development
Former-commit-id: 2281df8c5b [formerly e513fdbc3e] [formerly 2281df8c5b [formerly e513fdbc3e] [formerly 220e817e15 [formerly 1b5ab5d85b4f634357d0f52551b800378349b363]]]
Former-commit-id: 220e817e15
Former-commit-id: b5cccf449d [formerly 6b75cad25f]
Former-commit-id: c3bc837e61
2013-06-04 15:08:09 -05:00
Richard Peter
0751d58e02 Merge "Issue #2043 switch capeFunc to java. Change-Id: I35db8657838d1e11180248ebfb5011181ea09659" into development
Former-commit-id: 03b2db312e [formerly 82341a9fc1] [formerly 03b2db312e [formerly 82341a9fc1] [formerly 3be654e028 [formerly aa178f96c90b1c13ade6eb7db297583e5241601c]]]
Former-commit-id: 3be654e028
Former-commit-id: 9ef5384cd3 [formerly a765656f1d]
Former-commit-id: 93010b6cb2
2013-06-04 14:57:10 -05:00
Greg Armendariz
0ee50d0fcd Merge "Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file." into development
Former-commit-id: 3c5c1b65e3 [formerly f1fbb33f31] [formerly 3c5c1b65e3 [formerly f1fbb33f31] [formerly dbdb343fad [formerly 70379062d2943f045459a03c0de88ec09c1f0853]]]
Former-commit-id: dbdb343fad
Former-commit-id: aa94d1e875 [formerly af4fd585a2]
Former-commit-id: 9cc561d73a
2013-06-04 14:35:39 -05:00
Greg Armendariz
4e11eb1528 Merge "Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro filesystem in rary.ohd.filesystem - it used to be merged into the tar file." into development
Former-commit-id: 50db54dfeb [formerly eeff0a13e1] [formerly 50db54dfeb [formerly eeff0a13e1] [formerly ffa5962f52 [formerly 92f888181ea2d4e4dbfb44623c58a2a547b7e1d8]]]
Former-commit-id: ffa5962f52
Former-commit-id: fb5f888ce1 [formerly a7d5daf5f9]
Former-commit-id: 3ef9498bcb
2013-06-04 14:35:27 -05:00