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

2964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nate Jensen
dc98eb524f Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development 
Former-commit-id: a6f8174d0c [formerly a6f8174d0c [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]
Former-commit-id: 44cfe00b5e
Former-commit-id: e7f638ce3b
 2013-05-14 16:36:47 -05:00
Nate Jensen
851885b8c5 Merge "Issue #1869 Get plots working without dataURI" into development 
Former-commit-id: 6c42b5af64 [formerly 6c42b5af64 [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]
Former-commit-id: 661482f1dd
Former-commit-id: 301b294d66
 2013-05-14 16:23:00 -05:00
Nate Jensen
925339b84c Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages 
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 08b9ce4c62 [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 6f1684b85c
Former-commit-id: 22c23492c4
 2013-05-14 16:16:13 -05:00
Dustin Johnson
f625b26373 Merge "Issue #2000 Subscription duplication/overlap detection" into development 
Former-commit-id: 341ce0c8c2 [formerly 341ce0c8c2 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]
Former-commit-id: a5a0e3e280
Former-commit-id: 21e66394be
 2013-05-14 15:48:58 -05:00
Dustin Johnson
aa591995c6 Issue #2000 Subscription duplication/overlap detection 
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: db2e3cd9bb [formerly db2e3cd9bb [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]
Former-commit-id: fdf3ac7897
Former-commit-id: 085058e788
 2013-05-14 15:34:08 -05:00
Ben Steffensmeier
8a1b518934 Issue #1869 Get plots working without dataURI 
Former-commit-id: 79139629a6 [formerly 79139629a6 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]
Former-commit-id: a84c975426
Former-commit-id: 2dfb65b594
 2013-05-14 14:42:47 -05:00
Roger Ferrel
532787c043 Issue #1966 Initial setup. 
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: 0a02d5e018 [formerly 0a02d5e018 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]
Former-commit-id: 9f9f85f875
Former-commit-id: ab75cd5107
 2013-05-14 13:49:53 -05:00
Richard Peter
a734c8594a Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development 
Former-commit-id: 57d6790d5e [formerly 57d6790d5e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]
Former-commit-id: 6c406d6a8e
Former-commit-id: 3309e0c3b7
 2013-05-14 09:40:21 -05:00
Richard Peter
b7fc98ce28 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development 
Former-commit-id: 2f4b1d54a1 [formerly 2f4b1d54a1 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]
Former-commit-id: b76d402c98
Former-commit-id: 17407e863a
 2013-05-14 09:37:18 -05:00
Steve Harris
395d21565f 13.4.1-8 baseline 
Former-commit-id: 19866e7032 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: c59b52a266
Former-commit-id: a1c4cd2a39
 2013-05-14 09:21:41 -04:00
Ben Steffensmeier
386ba183bf Issue #1869 Modified D2D height Graphs to work without dataURI column. 
Former-commit-id: f856d0e02b [formerly f856d0e02b [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]
Former-commit-id: 1d900e6b94
Former-commit-id: d0e1ff7ce3
 2013-05-13 18:33:24 -05:00
Ben Steffensmeier
d78e7bcd78 Issue #1869 Remove DataURI column from GFE. 
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: 2536042f6d [formerly 2536042f6d [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]
Former-commit-id: 8661bde0cc
Former-commit-id: 039a92d9b9
 2013-05-13 17:35:00 -05:00
Richard Peter
81ece036ac Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes. 
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: 99391cfe12 [formerly 99391cfe12 [formerly 883a51484d03900852ed84820aa559e088c97335]]
Former-commit-id: d4135dba62
Former-commit-id: a02955e40c
 2013-05-13 17:16:57 -05:00
Richard Peter
f7470fbd8f Merge branch 'omaha_13.4.1' (13.4.1-7) into development 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: a12830f762 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]
Former-commit-id: c5040038d3
Former-commit-id: bcf4dcc810
 2013-05-13 17:11:05 -05:00
Richard Peter
4b5869684b Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: 8062c38b71 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]
Former-commit-id: ba590e2f93
Former-commit-id: 8e5929406c
 2013-05-13 16:33:50 -05:00
Dustin Johnson
a6532af8c9 Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development 
Former-commit-id: 0b2bdf1848 [formerly 0b2bdf1848 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]
Former-commit-id: ab755981a9
Former-commit-id: 0796694014
 2013-05-13 15:26:19 -05:00
Benjamin Phillippe
b8a47cc9be Issue #1948 Modified registry permgen memory size to accomodate additional Spring container 
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 5a113f1c43 [formerly 5a113f1c43 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]
Former-commit-id: 4165759e58
Former-commit-id: 2768c62541
 2013-05-13 15:20:28 -05:00
Matt Nash
086696f386 Issue #1870 add python localization to base feature 
Change-Id: I55149865870bc24995b267574ce2163b3c8f905c

Former-commit-id: 88365319b5 [formerly 88365319b5 [formerly 49b08468c487c8895c7fd59712936a79cf2b1999]]
Former-commit-id: 60d46cded8
Former-commit-id: 183c1a589a
 2013-05-13 14:54:50 -05:00
Steve Harris
dffa6d3bdc 13.4.1-7 baseline 
Former-commit-id: 4c6ff79e71 [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 8347bed50e
Former-commit-id: b35027f661
 2013-05-13 12:58:10 -04:00
Ben Steffensmeier
62db2bdcd3 Issue #1993 Explicitly specify levels for CapeStk Derived parameter. 
Former-commit-id: e5fc3f3835 [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]
Former-commit-id: 598ce2ae6c
Former-commit-id: b4c645f99f
 2013-05-13 11:42:54 -05:00
Richard Peter
570a330497 Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development 
Former-commit-id: 18c5ad2727 [formerly 18c5ad2727 [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]
Former-commit-id: 045a8c0b5d
Former-commit-id: c598cd3be0
 2013-05-13 11:42:23 -05:00
Ben Steffensmeier
e17c6f6857 Issue #1869 Modified D2D time series of point data to work without dataURI. 
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 2b4dd1521b [formerly 2b4dd1521b [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]
Former-commit-id: baf051a27e
Former-commit-id: 9aab9c6034
 2013-05-13 11:26:47 -05:00
Matt Nash
2db79b7608 Issue #1991 change hydro database in setup.env to reflect new one 
Change-Id: I2d7759ea34c4c8a63b484288603bd4988844c1dd

Former-commit-id: f5fe72f776 [formerly f5fe72f776 [formerly 8aac19338c40e2f278709c8bdbe85ec0b84c75d6]]
Former-commit-id: 1e354eddc4
Former-commit-id: c389c77256
 2013-05-13 09:05:30 -05:00
Mike Duff
83304c3e4c Issue #1919 - Fix VGBs in FFMP 
Former-commit-id: f887a41875 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]
Former-commit-id: 7874521269
Former-commit-id: d262dc63f0
 2013-05-10 09:58:02 -05:00
Dustin Johnson
da159a9c31 Merge "Issue #1967 undo mistake" into development 
Former-commit-id: e82d454167 [formerly e82d454167 [formerly f0529c591755d871796a6d5acae43c443c8c301c]]
Former-commit-id: 519d46724a
Former-commit-id: b3be6bb88b
 2013-05-10 09:25:58 -05:00
Nate Jensen
f3989b7187 Issue #1967 undo mistake 
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b

Former-commit-id: 250548dc66 [formerly 250548dc66 [formerly 2cd8c512ca8cbf0b7070587f659e9bc12f53e580]]
Former-commit-id: 47e402afc9
Former-commit-id: f8cd2effdf
 2013-05-10 09:20:17 -05:00
Bryan Kowal
7896fa119b Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8. 
Former-commit-id: e7bc2fecc6 [formerly e7bc2fecc6 [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]
Former-commit-id: c80ba9633e
Former-commit-id: 7cd6653d71
 2013-05-09 19:51:32 -05:00
Bryan Kowal
a73af7bdc0 Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location 
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

Former-commit-id: 5844657522 [formerly 5844657522 [formerly e9a9ed516bb3f1c9c2b4a768de07c46048de4077]]
Former-commit-id: baa6b26c34
Former-commit-id: eafa210750
 2013-05-09 16:46:04 -05:00
David Gillingham
65e64221d5 Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/. 
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4

Former-commit-id: 51063c7c53 [formerly 51063c7c53 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]
Former-commit-id: 36944298f4
Former-commit-id: d475d8f07b
 2013-05-09 14:28:17 -05:00
Matt Nash
870ac9d14d Issue #1990 allow work assignments to work with TestPathManager, if they set the baseline_repo variable to point to the location of the git repo for AWIPS2_baseline 
Change-Id: Iad2e6bc92e20d4135837fa1dd3a7521fa1dbb751

Former-commit-id: 5a4bd2894e [formerly 5a4bd2894e [formerly 2d26f8f1eac681586684680a84c41d06437dead5]]
Former-commit-id: 6ae260f4e7
Former-commit-id: bdbc49fe34
 2013-05-09 11:48:23 -05:00
Richard Peter
e1b58893c2 Merge "Issue #1869 Remove dataURI column from PluginDataObject. Change-Id: I3450130d8e68c065683794ba941a83897fe36745" into development 
Former-commit-id: ef69a8dbca [formerly ef69a8dbca [formerly 798845cfdf3356f5badae8cdd1cceb84094651c5]]
Former-commit-id: b361674d5c
Former-commit-id: 7ca31bd7ce
 2013-05-09 09:25:24 -05:00
Greg Armendariz
bb2272a1b3 Merge "Issue #1952 - first modification; removed libraries and updated set_hydro_env" into development 
Former-commit-id: 1ce683a4d5 [formerly 1ce683a4d5 [formerly 5f7feb732c50c76075d682cc2c88be9a9eedfd3e]]
Former-commit-id: 19ead4eabe
Former-commit-id: 09c6ccd54e
 2013-05-09 08:59:32 -05:00
Roger Ferrel
3aa2986115 Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen. 
Change-Id: If8045d03084b9085b573cc11c42b6a2f93ffacc8

Former-commit-id: d1a3e3dc2f [formerly d1a3e3dc2f [formerly b794f0b882d88cec6f552bf10f7f58096dfd5a69]]
Former-commit-id: 938cd275cc
Former-commit-id: 2be6266c9b
 2013-05-09 08:56:44 -05:00
Brad Gonzales
7938eea395 Issue #1970 added annotation comment to PluginDataObject header. 
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

Former-commit-id: 90d93e2a02 [formerly 90d93e2a02 [formerly a84978566dda2f943dff31f61c30ee286d961fd1]]
Former-commit-id: ed59927d62
Former-commit-id: 877fbacffe
 2013-05-09 08:05:49 -05:00
Bryan Kowal
f545c14592 Issue #1927 - handle the case where the python illusion does not exist. 
Change-Id: I227b8fcb8a80e9e712c2b1b8a116324a604219b3

Former-commit-id: 96f24ae69e [formerly 96f24ae69e [formerly 3af95f9f0a3449cbad2183a1ccda93c989c1e006]]
Former-commit-id: 7273b97aa4
Former-commit-id: 8b35bf6bda
 2013-05-08 21:27:43 -05:00
Nate Jensen
825c46815a Merge "Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication." into development 
Former-commit-id: 19f0ca1fb0 [formerly 19f0ca1fb0 [formerly 3ba0adb830cc0839d39a8cd938fbde3cf27e4651]]
Former-commit-id: d2a108ed8a
Former-commit-id: a5bedd2a27
 2013-05-08 18:42:28 -05:00
Nate Jensen
747163abc1 Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development 
Former-commit-id: 9e0f3acbc0 [formerly 9e0f3acbc0 [formerly b1e425c0da9a241a60f2a0508c40d180fe5058fa]]
Former-commit-id: e753329f47
Former-commit-id: 2299e22de2
 2013-05-08 18:40:51 -05:00
Ben Steffensmeier
7e721fb860 Issue #1869 Remove dataURI column from PluginDataObject. 
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 4209e014d8 [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]
Former-commit-id: 79015595ee
Former-commit-id: 1c51f0b5f2
 2013-05-08 18:39:25 -05:00
Max Schenkelberg
1d3e653520 Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication. 
Amend: Deleted old DecisionTree

Change-Id: Id51a32c42f5485a5261dd73f88f55a6fda3263c8

Former-commit-id: ea2501abbb [formerly ea2501abbb [formerly 4f76cfa7102f2b266bc94dbeb4ed6d2e4028c106]]
Former-commit-id: 40c76c2c82
Former-commit-id: fc27ac4a30
 2013-05-08 17:58:19 -05:00
Richard Peter
dfba22e206 Issue #1814: Remove slow consumer disconnect. Add time to live to all topics 
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: 4f3e86574b [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]
Former-commit-id: 697297803c
Former-commit-id: cfaeeaff5f
 2013-05-08 17:28:01 -05:00
Ron Anderson
a331ec539f Merge changes Id2d7981b,I094b88ed into omaha_13.4.1 
* changes:
  Issue #1939: Update AlertVizApplication to start NotificationManagerJob
  Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories


Former-commit-id: 8a297d8e53 [formerly 8a297d8e53 [formerly 1e94530814e28cc2a34cc92eab7164da3c3383e6]]
Former-commit-id: 65923ed892
Former-commit-id: 532c740ce4
 2013-05-08 15:08:40 -05:00
Richard Peter
92c4c493b8 Issue #1939: Update AlertVizApplication to start NotificationManagerJob 
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: f1f8260893 [formerly f1f8260893 [formerly 9f4d4de342b45ea54e328eec47fc606f1b087473]]
Former-commit-id: 785b402364
Former-commit-id: 4e878364c3
 2013-05-08 14:55:43 -05:00
Bryan Kowal
95aa897f3e Issue #1982 - prefix the qpid-java rpms with awips2. 
Former-commit-id: bc39afbd24 [formerly bc39afbd24 [formerly 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9]]
Former-commit-id: 4513b65ad6
Former-commit-id: 0c511e1d87
 2013-05-08 14:53:29 -05:00
Ben Steffensmeier
9b79e5e6cc Issue #1978 Perform variable substitution on subMenu IDs. 
Former-commit-id: aec7e4200c [formerly aec7e4200c [formerly d6ae38dcdde7984d5caebcb27c80780123599854]]
Former-commit-id: ef3086cf39
Former-commit-id: dd72b5cab1
 2013-05-08 14:43:59 -05:00
Ben Steffensmeier
fcda1fcb5e Issue #1980 Set paint status in GridResources for KML. 
Former-commit-id: 3d0e8a6e2d [formerly 3d0e8a6e2d [formerly a0dc21599e1056a39ac28bac7269f605e50082fb]]
Former-commit-id: 28cdc018a5
Former-commit-id: 37a96c2f4f
 2013-05-08 14:00:15 -05:00
Richard Peter
3129e77a4d Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories 
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651

Former-commit-id: ff60ca76f7 [formerly ff60ca76f7 [formerly 0168cccd15ddb07988d946e3f4d719035dc63fb5]]
Former-commit-id: f59e4c9de9
Former-commit-id: 30fc52f742
 2013-05-08 13:49:29 -05:00
Bryan Kowal
07d2000a41 Issue #1952 - first modification; removed libraries and updated set_hydro_env 
- libgofrtran is required by numpy so it will be installed at the standard location
- libjapser is provided by python
- libjvm is provided by the java; attempting to use the current version of libjvm


Former-commit-id: de588e9749 [formerly de588e9749 [formerly 2afcf9e6e48da20ccf9cffd8cdcf4ba2fd7aff1d]]
Former-commit-id: b40f36b341
Former-commit-id: fc67858e0f
 2013-05-08 13:41:08 -05:00
Nate Jensen
64fc831eb0 Merge "Issue #1986 optimized table sorting" into omaha_13.4.1 
Former-commit-id: 48d0829957 [formerly 48d0829957 [formerly ed7005a317c7d5bca71370544d6f2f79e10e9dee]]
Former-commit-id: edcd6c851c
Former-commit-id: c52c101f14
 2013-05-08 13:09:59 -05:00
Nate Jensen
ac747f4e02 Issue #1986 optimized table sorting 
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0

Former-commit-id: bc1d029bd4 [formerly bc1d029bd4 [formerly 2b9f07f2b7eaf500d554424daa0e2740384164f1]]
Former-commit-id: 8ad319d0f6
Former-commit-id: 1700be8b03
 2013-05-08 13:09:17 -05:00
Nate Jensen
d92c828191 Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1 
Former-commit-id: cdf07833b9 [formerly cdf07833b9 [formerly 7bf591249ed0495be49813e77c6c5111c0c9b0b4]]
Former-commit-id: 02464ba2d5
Former-commit-id: 39c92d85ee
 2013-05-08 13:03:50 -05:00