Commit graph

4162 commits

Author SHA1 Message Date
Nate Jensen
f42279eafb Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development
Former-commit-id: 6ef029fba9 [formerly db5ee537a8] [formerly 6ef029fba9 [formerly db5ee537a8] [formerly f677dd6415 [formerly cd816c1507ff5b413b6312fb6d7d83cff29436e1]]]
Former-commit-id: f677dd6415
Former-commit-id: 77af220675 [formerly 1b7b698c31]
Former-commit-id: 526b900d17
2013-11-07 16:59:35 -06:00
Brian Clements
1369b5d57a Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround


Former-commit-id: 6f0630aa55 [formerly 4f374688c8] [formerly 6f0630aa55 [formerly 4f374688c8] [formerly ea6b162369 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]
Former-commit-id: ea6b162369
Former-commit-id: 83edfb5349 [formerly a5b61b6d22]
Former-commit-id: 6772e50e80
2013-11-07 16:56:25 -06:00
Nate Jensen
43a40d9ab6 Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development
Former-commit-id: b9c95aadc0 [formerly f4fcd9e604] [formerly b9c95aadc0 [formerly f4fcd9e604] [formerly 7877229eac [formerly 7c4748fa0348820f0cf65330889253a04b4fab28]]]
Former-commit-id: 7877229eac
Former-commit-id: 97acbb8426 [formerly 1de52a9ea8]
Former-commit-id: 90bb5aa285
2013-11-07 16:39:50 -06:00
Ron Anderson
bc734d5611 Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: c611ab48be [formerly 12192b633f] [formerly c611ab48be [formerly 12192b633f] [formerly c1bda09fd9 [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]]
Former-commit-id: c1bda09fd9
Former-commit-id: 6636ebeb2d [formerly d2cd7c1257]
Former-commit-id: 4e8df8ea5b
2013-11-07 14:39:06 -06:00
Ron Anderson
cc95af7fa8 Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 0bfd9a1c98 [formerly a5bc64473a] [formerly 0bfd9a1c98 [formerly a5bc64473a] [formerly 42229b8eee [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]]
Former-commit-id: 42229b8eee
Former-commit-id: 9d56a36dbe [formerly 6442e2e933]
Former-commit-id: 298f4abbae
2013-11-07 14:38:39 -06:00
Richard Peter
94e0faa6c6 Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
2013-11-07 14:25:45 -06:00
Nate Jensen
4cc2354b21 Issue #2361 remove ISerializableObject from datadelivery.retrieval
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 6c1c3d77be [formerly 852751784b] [formerly 6c1c3d77be [formerly 852751784b] [formerly 6abe031dfe [formerly 0cc1dd3988f7d02d609246dba863552b46127db2]]]
Former-commit-id: 6abe031dfe
Former-commit-id: 0c9d826ab4 [formerly afcbc9e01a]
Former-commit-id: e579b6e75b
2013-11-07 13:18:21 -06:00
Nate Jensen
03911b4ce8 Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: a52e7b677f [formerly d4b6ad1eee] [formerly a52e7b677f [formerly d4b6ad1eee] [formerly cc2998b487 [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]]
Former-commit-id: cc2998b487
Former-commit-id: 286c7a8b1c [formerly ce583a88fb]
Former-commit-id: 57f237693e
2013-11-07 11:44:07 -06:00
David Gillingham
be9ed341f5 Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 3df38a8d41 [formerly e1df69e312] [formerly 3df38a8d41 [formerly e1df69e312] [formerly 0e74638eb2 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 1ed80f471c [formerly d0b188d577]
Former-commit-id: 50f9ad420b
2013-11-07 11:36:49 -06:00
Nate Jensen
23922309d3 Merge "Issue #2514 updated comments and history for OGC classes" into development
Former-commit-id: 852dfae29c [formerly e84d6cf1b5] [formerly 852dfae29c [formerly e84d6cf1b5] [formerly 3c335ed78f [formerly 5e5b1b53cf79fd058f65451aee4f255a73252ca1]]]
Former-commit-id: 3c335ed78f
Former-commit-id: adde0aee83 [formerly 5866e416f6]
Former-commit-id: 0b5cc2920f
2013-11-07 10:45:03 -06:00
Nate Jensen
642d4c5147 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development
Former-commit-id: a2a43a55a6 [formerly 0797f54a93] [formerly a2a43a55a6 [formerly 0797f54a93] [formerly 7b18c745d3 [formerly ba63e0d32f333fb2acaee2b15253f7cffb7122d4]]]
Former-commit-id: 7b18c745d3
Former-commit-id: 1a6dad4c53 [formerly f3d235a3f8]
Former-commit-id: ebdd3effe9
2013-11-07 10:44:46 -06:00
Benjamin Phillippe
64efd70b04 Issue #2530 Fixed ingest JVM crash on startup
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: 8d47d1bbd4 [formerly 7d605c471e] [formerly 8d47d1bbd4 [formerly 7d605c471e] [formerly 3561293fdd [formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]]
Former-commit-id: 3561293fdd
Former-commit-id: 1a8d9bf754 [formerly a9f8468c0e]
Former-commit-id: dc607f89b1
2013-11-07 10:38:53 -06:00
Nate Jensen
acccf2c827 Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: b01d5b16e0 [formerly f5feb9330f] [formerly b01d5b16e0 [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: c27c435cea [formerly 1b7ac545f8]
Former-commit-id: acec588299
2013-11-07 10:21:42 -06:00
Dave Hladky
18724a945f Issue #2529 Move DD edex event plugin from DD feature to DD core feature.
Former-commit-id: 1a5ddfbd5e [formerly f6996f9f5a] [formerly 1a5ddfbd5e [formerly f6996f9f5a] [formerly 5d3023d2f5 [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]]
Former-commit-id: 5d3023d2f5
Former-commit-id: f62685926a [formerly 5891412fb3]
Former-commit-id: a70f11148c
2013-11-07 10:08:01 -06:00
Nate Jensen
6446dbabbe Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development
Former-commit-id: 812f3fefce [formerly 348a968aed] [formerly 812f3fefce [formerly 348a968aed] [formerly 68c7d378cf [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]]
Former-commit-id: 68c7d378cf
Former-commit-id: 2f4c4833d3 [formerly d1f45128aa]
Former-commit-id: 64f064e15f
2013-11-07 09:15:02 -06:00
Bryan Kowal
8fb72374e9 13.5.3 build "fix"
Former-commit-id: 503762af19 [formerly 6692b985f3] [formerly 503762af19 [formerly 6692b985f3] [formerly a28133117c [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]]
Former-commit-id: a28133117c
Former-commit-id: cdf643510a [formerly ce6d80409d]
Former-commit-id: b04aa07437
2013-11-06 18:25:10 -06:00
Nate Jensen
f9be4065ec Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 7c0d9a7df8 [formerly 0f4ba6f90e] [formerly 7c0d9a7df8 [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]
Former-commit-id: 1da0e31b88
Former-commit-id: 048d52722f [formerly aef895c447]
Former-commit-id: 0ae0e070c9
2013-11-06 17:07:10 -06:00
Brian Clements
1529d9c37b Issue #2514 updated comments and history for OGC classes
removed dead and duplicate code from OGC


Former-commit-id: 4a673c2896 [formerly 308b06a47a] [formerly 4a673c2896 [formerly 308b06a47a] [formerly 525da47317 [formerly c13d5788a39898ef746b535d959bc845b6acad9c]]]
Former-commit-id: 525da47317
Former-commit-id: e74f7e2483 [formerly d1207aa0b5]
Former-commit-id: 80b395db55
2013-11-06 16:07:22 -06:00
Richard Peter
bc794bccfc Merge "Issue #2478: Remove blank lines in debug" into omaha_13.5.3
Former-commit-id: 436389b782 [formerly aa82fb8c91] [formerly 436389b782 [formerly aa82fb8c91] [formerly cf7c70beac [formerly a3130561e8705464873251575f569d6be95ade3d]]]
Former-commit-id: cf7c70beac
Former-commit-id: 082a8d0a94 [formerly 0e48596ca7]
Former-commit-id: 28e9ef5821
2013-11-06 16:04:20 -06:00
Richard Peter
e776e6e03c Issue #2478: Remove blank lines in debug
Former-commit-id: f099fb6936 [formerly 357eb79519] [formerly f099fb6936 [formerly 357eb79519] [formerly 18eff02d7a [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]]
Former-commit-id: 18eff02d7a
Former-commit-id: b62dd96321 [formerly 46f19c22ea]
Former-commit-id: c9f1b21c01
2013-11-06 16:03:45 -06:00
Bryan Kowal
017290d6a2 Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3
Former-commit-id: cd3e1d7aa4 [formerly d26d6a396f] [formerly cd3e1d7aa4 [formerly d26d6a396f] [formerly 100e14439e [formerly b171b7e66031ef05d98cb9a0819df6717acf0ba6]]]
Former-commit-id: 100e14439e
Former-commit-id: cdf1cb2ac6 [formerly 40c3059cc2]
Former-commit-id: 1c7e5b91b7
2013-11-06 15:58:06 -06:00
Bryan Kowal
bdc76d27b2 Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 0f104b0365 [formerly 4f1c083032] [formerly 0f104b0365 [formerly 4f1c083032] [formerly bb15605aa2 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]
Former-commit-id: bb15605aa2
Former-commit-id: 0b006511dc [formerly 0bc8cdc9be]
Former-commit-id: 46616c32eb
2013-11-06 15:57:14 -06:00
Richard Peter
4b021a422a Issue #2478: Update log message
Former-commit-id: d4bf633bd2 [formerly f9faa53eb4] [formerly d4bf633bd2 [formerly f9faa53eb4] [formerly b0746db723 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]]
Former-commit-id: b0746db723
Former-commit-id: 6e929c0dee [formerly f1a67f4dc1]
Former-commit-id: 7dcd8afea2
2013-11-06 15:45:23 -06:00
Lee Venable
3cc206a34f Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 326e4e31a7 [formerly 8585080cd1] [formerly 326e4e31a7 [formerly 8585080cd1] [formerly 20726d4e7c [formerly 13672783e6a5e452cb4105669a98708329b35541]]]
Former-commit-id: 20726d4e7c
Former-commit-id: 9a8a813cf8 [formerly 0c4566c411]
Former-commit-id: 5627ef0cc8
2013-11-06 15:42:40 -06:00
Nate Jensen
1a1a280d43 Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development
Former-commit-id: 53e94b4bdc [formerly 4309555b45] [formerly 53e94b4bdc [formerly 4309555b45] [formerly eae6b2526d [formerly a6cf090becd6da2c3fba1a2d46297c475be9d610]]]
Former-commit-id: eae6b2526d
Former-commit-id: e4c3c3a2ad [formerly ed9515eea8]
Former-commit-id: 97034141b3
2013-11-06 15:41:29 -06:00
Lee Venable
8e7bbca733 Merge "Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects." into development
Former-commit-id: ac2630eed4 [formerly ea5470af90] [formerly ac2630eed4 [formerly ea5470af90] [formerly e80418a639 [formerly 10789718f6ece30c3d766ec95b9fff0a5c03ee2c]]]
Former-commit-id: e80418a639
Former-commit-id: 55b68b6d2a [formerly fab0fab6a9]
Former-commit-id: dca845a22d
2013-11-06 15:41:02 -06:00
Nate Jensen
7ae88e6a91 Merge "Issue #2522 removing WCS and WMS from baseline" into development
Former-commit-id: 327f44aaff [formerly 1020b453f2] [formerly 327f44aaff [formerly 1020b453f2] [formerly f3ea98778e [formerly c4f29baf5ac830404a7e7739626b9a861844ec06]]]
Former-commit-id: f3ea98778e
Former-commit-id: 8cacf1c915 [formerly 3169c86070]
Former-commit-id: da640f45d9
2013-11-06 15:40:16 -06:00
Dave Hladky
ffaa5d5480 Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 62cd5b514d [formerly b0d929231c] [formerly 62cd5b514d [formerly b0d929231c] [formerly b2b44cd1d2 [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]]
Former-commit-id: b2b44cd1d2
Former-commit-id: 7ddd6d4c61 [formerly 35bc4378ca]
Former-commit-id: d3bd916cf4
2013-11-06 15:23:02 -06:00
Max Schenkelberg
53363b9bf7 Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: d7c8b8f662 [formerly 3369fbec2d] [formerly d7c8b8f662 [formerly 3369fbec2d] [formerly c28fd2b38d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]
Former-commit-id: c28fd2b38d
Former-commit-id: e4b7f3618c [formerly d53db3ddb6]
Former-commit-id: 751b8f2315
2013-11-06 15:07:18 -06:00
Richard Peter
70d5d65f35 Merge "Issue #2494 Updated to use thread logger" into development
Former-commit-id: 3c49575ca0 [formerly 22bd1521be] [formerly 3c49575ca0 [formerly 22bd1521be] [formerly 10160e3783 [formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]]]
Former-commit-id: 10160e3783
Former-commit-id: b10d5952c0 [formerly 88dbe31908]
Former-commit-id: 28744971c4
2013-11-06 14:03:34 -06:00
Richard Peter
fda9c8fbba Merge "Issue #2450 - Send notifications to Notification Center when subscriptions expire. peer review comments" into development
Former-commit-id: a699fed28b [formerly 2e162de539] [formerly a699fed28b [formerly 2e162de539] [formerly d9c878bc51 [formerly e52828f36303bd39521381149b0f585b6eb38439]]]
Former-commit-id: d9c878bc51
Former-commit-id: e480cefa56 [formerly cdc4a81cc5]
Former-commit-id: a76579cf4e
2013-11-06 14:02:51 -06:00
Richard Peter
f39e0c68c0 Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: b4a0f11c66 [formerly 27aa0dd6ba] [formerly b4a0f11c66 [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]
Former-commit-id: 6ccb444219
Former-commit-id: 6b8bea4af5 [formerly f4bdb0caea]
Former-commit-id: b52c9482ea
2013-11-06 13:44:11 -06:00
Ben Steffensmeier
925d8bca38 Issue #2493 remove mesowest.
Former-commit-id: f761c701cf [formerly d0b7966458] [formerly f761c701cf [formerly d0b7966458] [formerly 36916fedcd [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]
Former-commit-id: 36916fedcd
Former-commit-id: 5d31aad5c2 [formerly baebe37ba6]
Former-commit-id: afe014af99
2013-11-06 13:42:38 -06:00
Slav Korolev
a2e60dbe60 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: cc90a7af4b [formerly 076865bb61] [formerly cc90a7af4b [formerly 076865bb61] [formerly c25204d75b [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]
Former-commit-id: c25204d75b
Former-commit-id: 8fbf625667 [formerly 3223cd19cd]
Former-commit-id: b8ebc9ac63
2013-11-06 14:38:55 -05:00
Matt Nash
b08dedefae Issue #2511 fix for edex localization adapter to allow filename to appear in path
Change-Id: I9fea157a67799e1168d4b5f7efaf5ef6cdd64933

Former-commit-id: 5ab51caf38 [formerly 19bfe014c9] [formerly 5ab51caf38 [formerly 19bfe014c9] [formerly b3ac4b7a9c [formerly 8404299627c7d27731910821befc068767c43aa1]]]
Former-commit-id: b3ac4b7a9c
Former-commit-id: 14e606f17d [formerly 65696b4148]
Former-commit-id: 3445b9cbb5
2013-11-06 13:35:11 -06:00
Roger Ferrel
8533c6e67c Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784

Former-commit-id: f198c27f3f [formerly 07a7dd63c3] [formerly f198c27f3f [formerly 07a7dd63c3] [formerly e01b524542 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]]
Former-commit-id: e01b524542
Former-commit-id: d10ffdcca7 [formerly 274d52a694]
Former-commit-id: df1dc51d0d
2013-11-06 13:13:02 -06:00
Richard Peter
463f09984a Issue #2499: Fix build
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c

Former-commit-id: 15fd2f7a55 [formerly f3d8768b94] [formerly 15fd2f7a55 [formerly f3d8768b94] [formerly c09f68615c [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]
Former-commit-id: c09f68615c
Former-commit-id: 1b65a09a52 [formerly a653f9625a]
Former-commit-id: 3c129fb138
2013-11-06 13:09:32 -06:00
Mike Duff
8a8eb6ba4e Issue #2450 - Send notifications to Notification Center when subscriptions expire.
peer review comments

Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653

Former-commit-id: 2a97da896d [formerly 00bb57b481] [formerly 2a97da896d [formerly 00bb57b481] [formerly f3d07a9185 [formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]]]
Former-commit-id: f3d07a9185
Former-commit-id: ecaef4d639 [formerly cc3846be0b]
Former-commit-id: 70fbb031a2
2013-11-06 12:23:09 -06:00
Mike Duff
4cede401ec Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f

Former-commit-id: 65f9da04a9 [formerly e1180868e7] [formerly 65f9da04a9 [formerly e1180868e7] [formerly 35c4911e7e [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]
Former-commit-id: 35c4911e7e
Former-commit-id: e1b9c9daa8 [formerly 7e28ffcaad]
Former-commit-id: 39dda9d18c
2013-11-06 12:00:04 -06:00
Brian Clements
60101ea00a Issue #2522 removing WCS and WMS from baseline
removed dependencies on static URN constants in NativeCrsAuthority and abstract wxxm translator


Former-commit-id: 09f8fe5d95 [formerly f50c286820] [formerly 09f8fe5d95 [formerly f50c286820] [formerly 4144db8bfc [formerly 6f113f3c68f13ebac010bd2f8e22d3534c0a8072]]]
Former-commit-id: 4144db8bfc
Former-commit-id: d70dcff9c7 [formerly 3d02cc5aac]
Former-commit-id: 919592bebc
2013-11-06 09:55:45 -06:00
Richard Peter
ea3a141818 Issue #2499: Update text feature dependency
Former-commit-id: cf4a5d659c [formerly 361789672b] [formerly cf4a5d659c [formerly 361789672b] [formerly 3910b81d1a [formerly fe6fdf5a457be3e13774c946c9f425feac2bd88d]]]
Former-commit-id: 3910b81d1a
Former-commit-id: 4081e959e5 [formerly 374710dfff]
Former-commit-id: 85d17a0c28
2013-11-06 09:41:29 -06:00
Nate Jensen
4094bce5c4 Merge "Issue #2516 Remove classes causing WCS to not compile." into development
Former-commit-id: 387fe10d2b [formerly 52c5a3a966] [formerly 387fe10d2b [formerly 52c5a3a966] [formerly b6afeae19b [formerly 9f8341790c94cc59b79a1226e23635298092670f]]]
Former-commit-id: b6afeae19b
Former-commit-id: 981146e079 [formerly b1d6d16182]
Former-commit-id: 57c1f7b87c
2013-11-06 08:56:17 -06:00
Dave Hladky
43dd4f308d Issue #2494 Updated to use thread logger
Former-commit-id: 8be14ab6b0 [formerly f890152abc] [formerly 8be14ab6b0 [formerly f890152abc] [formerly 14469d6e22 [formerly 56505490277f53f77ad80e93aa6a31756a950db6]]]
Former-commit-id: 14469d6e22
Former-commit-id: 4911d0b9c4 [formerly a2ff05afb9]
Former-commit-id: ae9bde9f57
2013-11-06 08:26:25 -06:00
Ben Steffensmeier
5cf9a6ed01 Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 4639cd69f4 [formerly 5b53cb4c98] [formerly 4639cd69f4 [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]
Former-commit-id: 1d35086e8d
Former-commit-id: b64221f27b [formerly 8aefe5ff02]
Former-commit-id: a97ec9b8e5
2013-11-05 17:33:41 -06:00
Nate Jensen
c84829347f Merge "Issue #2521 DatasetMetaData URL update failure for point data. Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea" into development
Former-commit-id: e9c2738ffd [formerly 29293977f5] [formerly e9c2738ffd [formerly 29293977f5] [formerly 0b5dfb8ecd [formerly 56158b31325ccf0a06fe031790988eb8f39af7d9]]]
Former-commit-id: 0b5dfb8ecd
Former-commit-id: 6e228eca0f [formerly 5515ce94c7]
Former-commit-id: 154c132ae4
2013-11-05 15:57:00 -06:00
Richard Peter
37be7250ae Issue #2499: Remove defaultArchiveConfig.xml
Former-commit-id: 6af3e69ec8 [formerly 7507ae3460] [formerly 6af3e69ec8 [formerly 7507ae3460] [formerly 055057ed60 [formerly affca91a2999675f1e91f2add7cb276ae90535af]]]
Former-commit-id: 055057ed60
Former-commit-id: bdce762633 [formerly 406687d67f]
Former-commit-id: c558318eab
2013-11-05 15:56:50 -06:00
Nate Jensen
cb282cc273 Merge "Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use" into development
Former-commit-id: 0251b0fc44 [formerly 02dad36407] [formerly 0251b0fc44 [formerly 02dad36407] [formerly 8c4d84c429 [formerly 2192c52604b66e1a675c005c4bb9d972a166f5fb]]]
Former-commit-id: 8c4d84c429
Former-commit-id: 90bc290c33 [formerly 59126bf527]
Former-commit-id: 68d0c9e726
2013-11-05 15:56:13 -06:00
Nate Jensen
10e392a7e3 Merge "Issue #2520 - Update rpm query calls" into development
Former-commit-id: f5440862f3 [formerly 183f46df4b] [formerly f5440862f3 [formerly 183f46df4b] [formerly 76d21878e4 [formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]
Former-commit-id: 76d21878e4
Former-commit-id: 131e6c803f [formerly e604ea08f6]
Former-commit-id: 701fd08dd1
2013-11-05 15:55:57 -06:00
Richard Peter
ab072bf5f0 Merge "Issue #1679 Minor changes to support custom registry query plugins" into development
Former-commit-id: f3e6ed22b2 [formerly 962b21efa1] [formerly f3e6ed22b2 [formerly 962b21efa1] [formerly 82ad286653 [formerly 1c367816d3acbdbef01b4889a85e35abaf6623e4]]]
Former-commit-id: 82ad286653
Former-commit-id: 6f24910797 [formerly 48ccfe2cd8]
Former-commit-id: 69dccad4be
2013-11-05 15:50:34 -06:00
Richard Peter
0c7859f720 Merge "Issue #2494 Changed logging structure in DD" into development
Former-commit-id: 14cd82a6b8 [formerly df4e003cf3] [formerly 14cd82a6b8 [formerly df4e003cf3] [formerly 462ed0141a [formerly fbf54761279f40b3553b1d5d1c77f6129de18cb4]]]
Former-commit-id: 462ed0141a
Former-commit-id: 888f3383e3 [formerly d787096ee8]
Former-commit-id: 0888991d6c
2013-11-05 15:50:17 -06:00